[MPlayer-cvslog] r34412 - in trunk: DOCS/xml/cs/skin.xml DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml DOCS/xml/es/skin.xml DOCS/xml/fr/skin.xml DOCS/xml/hu/skin.xml DOCS/xml/pl/skin.xml DOCS/xml/ru/skin.xml gui/app.c ...

[ib]

Author: ib
Date: Thu Dec  8 18:11:52 2011
New Revision: 34412

Log:
Replace evSetURL by evLoadURL for consistency.

Maintain evSetURL for legacy reasons.

Modified:
   trunk/gui/app.c
   trunk/gui/app.h
   trunk/gui/ui/gtk/menu.c
   trunk/gui/ui/main.c
   trunk/gui/win32/skinload.c
   trunk/gui/win32/skinload.h

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/xml/cs/skin.xml
   trunk/DOCS/xml/de/skin.xml
   trunk/DOCS/xml/en/skin.xml
   trunk/DOCS/xml/es/skin.xml
   trunk/DOCS/xml/fr/skin.xml
   trunk/DOCS/xml/hu/skin.xml
   trunk/DOCS/xml/pl/skin.xml
   trunk/DOCS/xml/ru/skin.xml

Modified: trunk/gui/app.c
==============================================================================
--- trunk/gui/app.c	Thu Dec  8 17:37:42 2011	(r34411)
+++ trunk/gui/app.c	Thu Dec  8 18:11:52 2011	(r34412)
@@ -48,7 +48,8 @@ static const evName evNames[] = {
     { evPlaylist,          "evPlaylist"          },
     { evPlayVCD,           "evPlayVCD"           },
     { evPlayDVD,           "evPlayDVD"           },
-    { evSetURL,            "evSetURL"            },
+    { evLoadURL,           "evSetURL"            }, // legacy
+    { evLoadURL,           "evLoadURL"           },
     { evPlaySwitchToPause, "evPlaySwitchToPause" },
     { evPauseSwitchToPlay, "evPauseSwitchToPlay" },
     { evBackward10sec,     "evBackward10sec"     },

Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h	Thu Dec  8 17:37:42 2011	(r34411)
+++ trunk/gui/app.h	Thu Dec  8 18:11:52 2011	(r34412)
@@ -39,7 +39,7 @@
 #define evPlaylist          10
 #define evPlayVCD           40
 #define evPlayDVD           39
-#define evSetURL          5013
+#define evLoadURL         5013
 #define evPlaySwitchToPause 16
 #define evPauseSwitchToPlay 17
 

Modified: trunk/gui/ui/gtk/menu.c
==============================================================================
--- trunk/gui/ui/gtk/menu.c	Thu Dec  8 17:37:42 2011	(r34411)
+++ trunk/gui/ui/gtk/menu.c	Thu Dec  8 18:11:52 2011	(r34412)
@@ -431,7 +431,7 @@ GtkWidget * create_PopUpMenu( void )
 #ifdef CONFIG_DVDREAD
     AddMenuItem( window1, (const char*)playdvd_xpm, SubMenu,MSGTR_MENU_PlayDVD, evPlayDVD );
 #endif
-    AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL, evSetURL );
+    AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL, evLoadURL );
     AddMenuItem( window1, (const char*)sub_xpm, SubMenu,MSGTR_MENU_LoadSubtitle"   ", evLoadSubtitle );
     AddMenuItem( window1, (const char*)nosub_xpm, SubMenu,MSGTR_MENU_DropSubtitle,evDropSubtitle );
     AddMenuItem( window1, (const char*)loadeaf_xpm, SubMenu,MSGTR_MENU_LoadExternAudioFile, evLoadAudioFile );

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Thu Dec  8 17:37:42 2011	(r34411)
+++ trunk/gui/ui/main.c	Thu Dec  8 18:11:52 2011	(r34412)
@@ -144,7 +144,7 @@ void uiEventHandling( int msg,float para
         mplayer( MPLAYER_EXIT_GUI, EXIT_QUIT, 0 );
         break;
 
-   case evSetURL:
+   case evLoadURL:
         gtkShow( evPlayNetwork,NULL );
 	break;
 

Modified: trunk/gui/win32/skinload.c
==============================================================================
--- trunk/gui/win32/skinload.c	Thu Dec  8 17:37:42 2011	(r34411)
+++ trunk/gui/win32/skinload.c	Thu Dec  8 18:11:52 2011	(r34412)
@@ -59,7 +59,8 @@ static const evName evNames[] =
     {   evPlaylist,             "evPlaylist"            },
     {   evPlayVCD,              "evPlayVCD"             },
     {   evPlayDVD,              "evPlayDVD"             },
-    {   evSetURL,               "evSetURL"              },
+    {   evLoadURL,              "evSetURL"              }, // legacy
+    {   evLoadURL,              "evLoadURL"             },
     {   evPlaySwitchToPause,    "evPlaySwitchToPause"   },
     {   evPauseSwitchToPlay,    "evPauseSwitchToPlay"   },
     {   evBackward10sec,        "evBackward10sec"       },

Modified: trunk/gui/win32/skinload.h
==============================================================================
--- trunk/gui/win32/skinload.h	Thu Dec  8 17:37:42 2011	(r34411)
+++ trunk/gui/win32/skinload.h	Thu Dec  8 18:11:52 2011	(r34412)
@@ -146,7 +146,7 @@ skin_t *loadskin(char *skindir, int desk
 #define evPlaylist          10
 #define evPlayVCD           40
 #define evPlayDVD           39
-#define evSetURL          5013
+#define evLoadURL         5013
 #define evPlaySwitchToPause 16
 #define evPauseSwitchToPlay 17