[MPlayer-cvslog] r34403 - in trunk/gui/win32: gui.c interface.c skinload.c skinload.h

[ib]

Author: ib
Date: Thu Dec  8 13:05:00 2011
New Revision: 34403

Log:
Remove event evDropFile from Win32 GUI.

This event doesn't exist in the X11/GTK GUI
and it is identical to evLoadPlay.

Modified:
   trunk/gui/win32/gui.c
   trunk/gui/win32/interface.c
   trunk/gui/win32/skinload.c
   trunk/gui/win32/skinload.h

Modified: trunk/gui/win32/gui.c
==============================================================================
--- trunk/gui/win32/gui.c	Thu Dec  8 03:44:19 2011	(r34402)
+++ trunk/gui/win32/gui.c	Thu Dec  8 13:05:00 2011	(r34403)
@@ -238,7 +238,7 @@ static void handlemsg(HWND hWnd, int msg
         case evLoadPlay:
         case evLoad:
             if(display_openfilewindow(gui, 0) && (msg == evLoadPlay))
-                handlemsg(hWnd, evDropFile);
+                handlemsg(hWnd, evLoadPlay);
             return;
         case evLoadSubtitle:
             display_opensubtitlewindow(gui);
@@ -501,13 +501,13 @@ static LRESULT CALLBACK SubProc(HWND hWn
                         gui->playlist->add_track(gui->playlist, file, NULL, NULL, 0);
                 }
                 DragFinish((HDROP) wParam);
-                handlemsg(hWnd, evDropFile);
+                handlemsg(hWnd, evLoadPlay);
             }
             else
             {
                 gui->playlist->clear_playlist(gui->playlist);
                 gui->playlist->add_track(gui->playlist, (const char *) wParam, NULL, NULL, 0);
-                handlemsg(hWnd, evDropFile);
+                handlemsg(hWnd, evLoadPlay);
             }
             SetForegroundWindow(gui->subwindow);
             return 0;
@@ -790,13 +790,13 @@ static LRESULT CALLBACK EventProc(HWND h
                         gui->playlist->add_track(gui->playlist, file, NULL, NULL, 0);
                 }
                 DragFinish((HDROP) wParam);
-                handlemsg(hWnd, evDropFile);
+                handlemsg(hWnd, evLoadPlay);
             }
             else
             {
                 gui->playlist->clear_playlist(gui->playlist);
                 gui->playlist->add_track(gui->playlist, (const char *) wParam, NULL, NULL, 0);
-                handlemsg(hWnd, evDropFile);
+                handlemsg(hWnd, evLoadPlay);
             }
             SetForegroundWindow(gui->mainwindow);
             return 0;
@@ -1118,7 +1118,7 @@ static LRESULT CALLBACK EventProc(HWND h
 
 static void startplay(gui_t *gui)
 {
-    handlemsg(gui->mainwindow, evDropFile);
+    handlemsg(gui->mainwindow, evLoadPlay);
 }
 
 /* returns the bits per pixel of the desktop */

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Thu Dec  8 03:44:19 2011	(r34402)
+++ trunk/gui/win32/interface.c	Thu Dec  8 13:05:00 2011	(r34403)
@@ -227,7 +227,6 @@ static void guiSetEvent(int event)
             mp_input_queue_cmd(cmd);
             break;
         }
-        case evDropFile:
         case evLoadPlay:
         {
             switch(guiInfo.StreamType)

Modified: trunk/gui/win32/skinload.c
==============================================================================
--- trunk/gui/win32/skinload.c	Thu Dec  8 03:44:19 2011	(r34402)
+++ trunk/gui/win32/skinload.c	Thu Dec  8 13:05:00 2011	(r34403)
@@ -47,7 +47,6 @@ static const evName evNames[] =
 {
     {   evNone,                 "evNone"                },
     {   evPlay,                 "evPlay"                },
-    {   evDropFile,             "evDropFile"            },
     {   evStop,                 "evStop"                },
     {   evPause,                "evPause"               },
     {   evPrev,                 "evPrev"                },

Modified: trunk/gui/win32/skinload.h
==============================================================================
--- trunk/gui/win32/skinload.h	Thu Dec  8 03:44:19 2011	(r34402)
+++ trunk/gui/win32/skinload.h	Thu Dec  8 13:05:00 2011	(r34403)
@@ -183,7 +183,6 @@ skin_t *loadskin(char *skindir, int desk
 #define evSetAspect         44
 #define evSetAudio          45
 #define evSetVideo          46
-#define evDropFile          47
 #define evPlayCD            48
 
 #define evExit              1000