Use <vdr/foo.h> instead of <foo.h> for VDR includes everywhere. This is how

stuff in VDR example plugins and Makefiles is, and since one <vdr/...> crept
in in 0.1.11, let's just use it everywhere.


git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@955 e10066b5-e1e2-0310-b819-94efdf66514b

21 files changed, 45 insertions, 46 deletions

diff --git a/i18n.h b/i18n.h
index 884adc2..47c4362 100644
--- a/i18n.h
+++ b/i18n.h
@@ -9,8 +9,7 @@
 #ifndef _I18N__H
 #define _I18N__H
 
-// #include <vdr/i18n.h>
-#include <i18n.h>
+#include <vdr/i18n.h>
 
 extern const tI18nPhrase Phrases[];
 #endif                                            //_I18N__H
diff --git a/mg_image_provider.h b/mg_image_provider.h
index b758336..3c7433c 100644
--- a/mg_image_provider.h
+++ b/mg_image_provider.h
@@ -5,7 +5,7 @@
 
 class mgItemGd;
 
-#include <thread.h>
+#include <vdr/thread.h>
 
 #include <string>
 #include <vector>
diff --git a/mg_item_gd.c b/mg_item_gd.c
index 4244447..274f11e 100644
--- a/mg_item_gd.c
+++ b/mg_item_gd.c
@@ -19,7 +19,7 @@
 #include "mg_db.h"
 
 // this one last because of swap() redefinition:
-// #include <tools.h>
+// #include <vdr/tools.h>
 
 static bool gd_music_dir_exists[100];
 static bool gd_music_dirs_scanned=false;
diff --git a/mg_selection.c b/mg_selection.c
index b9798f8..d00537f 100644
--- a/mg_selection.c
+++ b/mg_selection.c
@@ -21,8 +21,8 @@
 #include "mg_thread_sync.h"
 
 #if VDRVERSNUM >= 10307
-#include <interface.h>
-#include <skins.h>
+#include <vdr/interface.h>
+#include <vdr/skins.h>
 #endif
 
 
diff --git a/mg_setup.c b/mg_setup.c
index 251f57e..07e0f3c 100644
--- a/mg_setup.c
+++ b/mg_setup.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string>
 #include <getopt.h>
-// #include <tools.h>
+// #include <vdr/tools.h>
 
 mgSetup the_setup;
 
diff --git a/mg_thread_sync.h b/mg_thread_sync.h
index 23085d5..1e51c10 100644
--- a/mg_thread_sync.h
+++ b/mg_thread_sync.h
@@ -12,7 +12,7 @@
 #ifndef _MG_THREADSYNC_H
 #define _MG_THREADSYNC_H
 
-#include <thread.h>
+#include <vdr/thread.h>
 
 class mgThreadSync : public cThread
 {
diff --git a/muggle.c b/muggle.c
index 8e3a4b7..7b1cd9e 100644
--- a/muggle.c
+++ b/muggle.c
@@ -17,9 +17,9 @@
 #include "mg_tools.h"
 
 #include "i18n.h"
-#include <tools.h>
-#include <getopt.h>
-#include <config.h>
+#include <vdr/tools.h>
+#include <vdr/getopt.h>
+#include <vdr/config.h>
 
 static const char VERSION[] = "0.1.11";
 static const char DESCRIPTION[] = "Media juggle plugin for VDR";
diff --git a/muggle.h b/muggle.h
index b1bf9ef..2d29f00 100644
--- a/muggle.h
+++ b/muggle.h
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <pthread.h>
-#include <plugin.h>
+#include <vdr/plugin.h>
 
 class mgMainMenu;
 
diff --git a/vdr_actions.c b/vdr_actions.c
index ec9a963..41ffa95 100644
--- a/vdr_actions.c
+++ b/vdr_actions.c
@@ -18,15 +18,15 @@
 #include <vector>
 #include <assert.h>
 
-#include <menuitems.h>
-#include <tools.h>
-#include <plugin.h>
+#include <vdr/menuitems.h>
+#include <vdr/tools.h>
+#include <vdr/plugin.h>
 
 #include "mg_setup.h"
 #include "vdr_actions.h"
 #include "vdr_menu.h"
 #include "i18n.h"
-#include <interface.h>
+#include <vdr/interface.h>
 
 #define DEBUG
 #include "mg_tools.h"
diff --git a/vdr_actions.h b/vdr_actions.h
index 374083e..8edef19 100644
--- a/vdr_actions.h
+++ b/vdr_actions.h
@@ -15,8 +15,8 @@
 
 #include <string>
 
-#include <osd.h>
-#include <plugin.h>
+#include <vdr/osd.h>
+#include <vdr/plugin.h>
 
 #include "mg_selection.h"
 
diff --git a/vdr_decoder.c b/vdr_decoder.c
index 4ca42d9..60087cc 100644
--- a/vdr_decoder.c
+++ b/vdr_decoder.c
@@ -23,8 +23,8 @@
 
 #include "mg_selection.h"
 
-#include <videodir.h>
-#include <interface.h>
+#include <vdr/videodir.h>
+#include <vdr/interface.h>
 
 
 #include "vdr_decoder.h"
diff --git a/vdr_decoder.h b/vdr_decoder.h
index 74f51ad..4867971 100644
--- a/vdr_decoder.h
+++ b/vdr_decoder.h
@@ -20,7 +20,7 @@
 
 #include <string>
 
-#include <thread.h>
+#include <vdr/thread.h>
 #include <string>
 
 #define DEC_ID(a,b,c,d) (((a)<<24)+((b)<<16)+((c)<<8)+(d))
diff --git a/vdr_decoder_sndfile.c b/vdr_decoder_sndfile.c
index 7d45e29..a906df1 100644
--- a/vdr_decoder_sndfile.c
+++ b/vdr_decoder_sndfile.c
@@ -35,7 +35,7 @@
 #include "vdr_decoder_sndfile.h"
 #include "i18n.h"
 
-#include <tools.h>
+#include <vdr/tools.h>
 
 #ifndef SNDFILE_1
 #error You must use libsndfile version 1.x.x
diff --git a/vdr_decoder_sndfile.h b/vdr_decoder_sndfile.h
index eed8a16..a9045d0 100644
--- a/vdr_decoder_sndfile.h
+++ b/vdr_decoder_sndfile.h
@@ -34,7 +34,7 @@
 #include <mad.h>
 #include <sndfile.h>
 
-#include <thread.h>
+#include <vdr/thread.h>
 
 #include "vdr_decoder.h"
 
diff --git a/vdr_menu.c b/vdr_menu.c
index 05aa41a..ada4fd1 100644
--- a/vdr_menu.c
+++ b/vdr_menu.c
@@ -16,14 +16,14 @@
 #include <string>
 #include <vector>
 
-#include <menuitems.h>
-#include <tools.h>
-#include <config.h>
-#include <plugin.h>
+#include <vdr/menuitems.h>
+#include <vdr/tools.h>
+#include <vdr/config.h>
+#include <vdr/plugin.h>
 
 #if VDRVERSNUM >= 10307
-#include <interface.h>
-#include <skins.h>
+#include <vdr/interface.h>
+#include <vdr/skins.h>
 #endif
 
 #include "mg_setup.h"
diff --git a/vdr_menu.h b/vdr_menu.h
index fe58121..971af4d 100644
--- a/vdr_menu.h
+++ b/vdr_menu.h
@@ -17,9 +17,9 @@
 // #include <list>
 #include <vector>
 
-#include <osd.h>
-#include <plugin.h>
-#include <status.h>
+#include <vdr/osd.h>
+#include <vdr/plugin.h>
+#include <vdr/status.h>
 #include "vdr_actions.h"
 
 #include "vdr_player.h"
diff --git a/vdr_network.h b/vdr_network.h
index 4725d2a..66f30f7 100644
--- a/vdr_network.h
+++ b/vdr_network.h
@@ -7,9 +7,9 @@
 #ifndef ___NETWORK_H
 #define ___NETWORK_H
 
-#include <thread.h>
-#include <ringbuffer.h>
-#include <config.h>
+#include <vdr/thread.h>
+#include <vdr/ringbuffer.h>
+#include <vdr/config.h>
 
 class cRingBufferLinear;
 
diff --git a/vdr_player.c b/vdr_player.c
index cb81485..e10d9e4 100644
--- a/vdr_player.c
+++ b/vdr_player.c
@@ -29,14 +29,14 @@
 #include <mad.h>
 
 #include <linux/dvb/video.h>
-#include <player.h>
-#include <device.h>
-#include <thread.h>
-#include <ringbuffer.h>
-#include <tools.h>
-#include <recording.h>
-#include <status.h>
-#include <plugin.h>
+#include <vdr/player.h>
+#include <vdr/device.h>
+#include <vdr/thread.h>
+#include <vdr/ringbuffer.h>
+#include <vdr/tools.h>
+#include <vdr/recording.h>
+#include <vdr/status.h>
+#include <vdr/plugin.h>
 
 #include "vdr_player.h"
 #include "vdr_decoder.h"
diff --git a/vdr_player.h b/vdr_player.h
index 0b6e3a3..d50b768 100644
--- a/vdr_player.h
+++ b/vdr_player.h
@@ -17,7 +17,7 @@
 #ifndef ___VDR_PLAYER_H
 #define ___VDR_PLAYER_H
 
-#include <player.h>
+#include <vdr/player.h>
 #include "mg_selection.h"
 #if VDRVERSNUM >= 10307
 class cOsd;
diff --git a/vdr_setup.h b/vdr_setup.h
index 2566820..77f5407 100644
--- a/vdr_setup.h
+++ b/vdr_setup.h
@@ -21,7 +21,7 @@
 
 #include "mg_setup.h"
 
-#include <menuitems.h>
+#include <vdr/menuitems.h>
 
 #define MAX_PATH 256
 
diff --git a/vdr_stream.c b/vdr_stream.c
index f7366de..cf3be99 100644
--- a/vdr_stream.c
+++ b/vdr_stream.c
@@ -22,7 +22,7 @@
 #include <sys/statfs.h>
 #include <iostream>
 
-#include <interface.h>
+#include <vdr/interface.h>
 
 // #include "setup-mp3.h"
 #include "vdr_stream.h"