Mercurial > mplayer.hg

changeset 34315:ecb8df177459

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove event evDropFile from Win32 GUI. This event doesn't exist in the X11/GTK GUI and it is identical to evLoadPlay.
author ib
date Thu, 08 Dec 2011 12:05:00 +0000
parents b2c01a543421
children 446aeefc216b
files gui/win32/gui.c gui/win32/interface.c gui/win32/skinload.c gui/win32/skinload.h
diffstat 4 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/gui/win32/gui.c	Thu Dec 08 02:44:19 2011 +0000
+++ b/gui/win32/gui.c	Thu Dec 08 12:05:00 2011 +0000
@@ -238,7 +238,7 @@
         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 @@
                         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 @@
                         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 void startplay(gui_t *gui)
 {
-    handlemsg(gui->mainwindow, evDropFile);
+    handlemsg(gui->mainwindow, evLoadPlay);
 }
 
 /* returns the bits per pixel of the desktop */
--- a/gui/win32/interface.c	Thu Dec 08 02:44:19 2011 +0000
+++ b/gui/win32/interface.c	Thu Dec 08 12:05:00 2011 +0000
@@ -227,7 +227,6 @@
             mp_input_queue_cmd(cmd);
             break;
         }
-        case evDropFile:
         case evLoadPlay:
         {
             switch(guiInfo.StreamType)
--- a/gui/win32/skinload.c	Thu Dec 08 02:44:19 2011 +0000
+++ b/gui/win32/skinload.c	Thu Dec 08 12:05:00 2011 +0000
@@ -47,7 +47,6 @@
 {
     {   evNone,                 "evNone"                },
     {   evPlay,                 "evPlay"                },
-    {   evDropFile,             "evDropFile"            },
     {   evStop,                 "evStop"                },
     {   evPause,                "evPause"               },
     {   evPrev,                 "evPrev"                },
--- a/gui/win32/skinload.h	Thu Dec 08 02:44:19 2011 +0000
+++ b/gui/win32/skinload.h	Thu Dec 08 12:05:00 2011 +0000
@@ -183,7 +183,6 @@
 #define evSetAspect         44
 #define evSetAudio          45
 #define evSetVideo          46
-#define evDropFile          47
 #define evPlayCD            48
 
 #define evExit              1000