Start unifying names of internal preprocessor directives.

Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 15 insertions, 15 deletions

diff --git a/gui/win32/dialogs.c b/gui/win32/dialogs.c
index 370ca789cd..b750fb9caf 100644
--- a/gui/win32/dialogs.c
+++ b/gui/win32/dialogs.c
@@ -778,7 +778,7 @@ void display_skinbrowser(gui_t* gui)
    UpdateWindow(hWnd);
 }
 
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
 static LRESULT CALLBACK TitleChapterWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
     static HWND title;
diff --git a/gui/win32/gui.c b/gui/win32/gui.c
index 9f55cb4f46..a56a4c77a7 100644
--- a/gui/win32/gui.c
+++ b/gui/win32/gui.c
@@ -407,7 +407,7 @@ static LRESULT CALLBACK SubProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
                 case ID_NTRACK:
                     handlemsg(hWnd, evNext);
                     break;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
                 case ID_CHAPTERSEL:
                     display_chapterselwindow(gui);
                     break;
@@ -1005,7 +1005,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
                             sprintf(searchpath, "%sVIDEO_TS", device + pos);
                             if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES)
                             {
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
                                 if (dvd_device) free(dvd_device);
                                 dvd_device = strdup(device + pos);
                                 dvd_title = dvd_chapter = dvd_angle = 1;
@@ -1211,7 +1211,7 @@ static void create_submenu(gui_t *gui)
     AppendMenu(gui->submenu, MF_STRING | MF_POPUP, (UINT) gui->aspectmenu, "Aspect Ratio");
     AppendMenu(gui->submenu, MF_STRING | MF_POPUP, (UINT) gui->subtitlemenu, "Subtitle Options");
     AppendMenu(gui->submenu, MF_STRING | MF_POPUP, (UINT) gui->dvdmenu, "DVD Options");
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
     AppendMenu(gui->dvdmenu, MF_STRING | MF_GRAYED, ID_CHAPTERSEL, "Select Title/Chapter...");
 #endif
     AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_TOGGLE, "Subtitle Visibility On/Off");
diff --git a/gui/win32/interface.c b/gui/win32/interface.c
index 2c357a9527..6b3eaafc54 100644
--- a/gui/win32/interface.c
+++ b/gui/win32/interface.c
@@ -32,7 +32,7 @@
 #include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
 #include "stream/stream_dvd.h"
 #endif
 #include "input/input.h"
@@ -151,7 +151,7 @@ static void guiSetEvent(int event)
         case evPause:
             mplPause();
             break;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
         case evPlayDVD:
         {
             static char dvdname[MAX_PATH];
@@ -273,7 +273,7 @@ static void guiSetEvent(int event)
         {
             switch(guiIntfStruct.StreamType)
             {
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
                 case STREAMTYPE_DVD:
                 {
                     guiIntfStruct.Title = guiIntfStruct.DVD.current_title;
@@ -337,7 +337,7 @@ void mplNext(void)
     if(guiIntfStruct.Playing == 2) return;
     switch(guiIntfStruct.StreamType)
     {
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
         case STREAMTYPE_DVD:
             if(guiIntfStruct.DVD.current_chapter == (guiIntfStruct.DVD.chapters - 1))
                 return;
@@ -359,7 +359,7 @@ void mplPrev(void)
     if(guiIntfStruct.Playing == 2) return;
     switch(guiIntfStruct.StreamType)
     {
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
         case STREAMTYPE_DVD:
             if(guiIntfStruct.DVD.current_chapter == 1)
                 return;
@@ -405,7 +405,7 @@ void mplEnd( void )
     guiIntfStruct.Position = 0;
     guiIntfStruct.AudioType = 0;
 
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
     guiIntfStruct.DVD.current_title = 1;
     guiIntfStruct.DVD.current_chapter = 1;
     guiIntfStruct.DVD.current_angle = 1;
@@ -521,7 +521,7 @@ void guiDone(void)
 int guiGetEvent(int type, char *arg)
 {
     stream_t *stream = (stream_t *) arg;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
     dvd_priv_t *dvdp = (dvd_priv_t *) arg;
 #endif
     if(!mygui || !mygui->skin) return 0;
@@ -549,7 +549,7 @@ int guiGetEvent(int type, char *arg)
             {
                 case STREAMTYPE_PLAYLIST:
                     break;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
                 case STREAMTYPE_DVD:
                 {
                     char tmp[512];
@@ -614,7 +614,7 @@ int guiGetEvent(int type, char *arg)
             guiIntfStruct.StreamType = stream->type;
             switch(stream->type)
             {
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
                 case STREAMTYPE_DVD:
                     guiGetEvent(guiSetDVD, (char *) stream->priv);
                     break;
@@ -622,7 +622,7 @@ int guiGetEvent(int type, char *arg)
             }
             break;
         }
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
         case guiSetDVD:
         {
             guiIntfStruct.DVD.titles = dvdp->vmg_file->tt_srpt->nr_of_srpts;
diff --git a/gui/win32/widgetrender.c b/gui/win32/widgetrender.c
index 71780d8f1b..0ac2e730ea 100644
--- a/gui/win32/widgetrender.c
+++ b/gui/win32/widgetrender.c
@@ -162,7 +162,7 @@ static char *generatetextfromlabel(widget *item)
 
     if(guiIntfStruct.StreamType == 0)
         stringreplace(text, "$T", "f");
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
     else if(guiIntfStruct.StreamType == STREAMTYPE_DVD || guiIntfStruct.StreamType == STREAMTYPE_DVDNAV)
         stringreplace(text, "$T", "d");
 #endif