[MPlayer-cvslog] r37032 - in trunk: gui/dialog/fileselect.c gui/dialog/playlist.c gui/dialog/url.c gui/interface.c gui/interface.h gui/ui/actions.c gui/win32/interface.c mplayer.c
ib
subversion at mplayerhq.hu
Fri Mar 21 16:01:48 CET 2014
Author: ib
Date: Fri Mar 21 16:01:48 2014
New Revision: 37032
Log:
Cosmetic: Rename symbolic constants GUI_FILE_SAME and GUI_FILE_NEW.
They aren't restricted to files but apply to all media, so change
FILE to MEDIUM.
Modified:
trunk/gui/dialog/fileselect.c
trunk/gui/dialog/playlist.c
trunk/gui/dialog/url.c
trunk/gui/interface.c
trunk/gui/interface.h
trunk/gui/ui/actions.c
trunk/gui/win32/interface.c
trunk/mplayer.c
Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c Fri Mar 21 15:51:39 2014 (r37031)
+++ trunk/gui/dialog/fileselect.c Fri Mar 21 16:01:48 2014 (r37032)
@@ -478,7 +478,7 @@ static void fs_Ok_released(GtkButton *bu
g_free(selected);
}
- guiInfo.NewPlay = GUI_FILE_NEW;
+ guiInfo.NewPlay = GUI_MEDIUM_NEW;
sub_fps = 0;
fs_PersistantHistory(fsSelectedDirectory);
break;
Modified: trunk/gui/dialog/playlist.c
==============================================================================
--- trunk/gui/dialog/playlist.c Fri Mar 21 15:51:39 2014 (r37031)
+++ trunk/gui/dialog/playlist.c Fri Mar 21 16:01:48 2014 (r37032)
@@ -166,7 +166,7 @@ static void plButtonReleased( GtkButton
if ( item )
{
uiSetFile( item->path,item->name,STREAMTYPE_FILE );
- guiInfo.NewPlay = GUI_FILE_NEW;
+ guiInfo.NewPlay = GUI_MEDIUM_NEW;
guiInfo.PlaylistNext = !guiInfo.Playing;
guiInfo.Track = 1;
}
Modified: trunk/gui/dialog/url.c
==============================================================================
--- trunk/gui/dialog/url.c Fri Mar 21 15:51:39 2014 (r37031)
+++ trunk/gui/dialog/url.c Fri Mar 21 16:01:48 2014 (r37032)
@@ -81,7 +81,7 @@ static void button_clicked(GtkButton *bu
listMgr(URLLIST_ITEM_ADD, item);
}
- guiInfo.NewPlay = GUI_FILE_NEW;
+ guiInfo.NewPlay = GUI_MEDIUM_NEW;
uiEvent(evPlay, 0);
}
}
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Fri Mar 21 15:51:39 2014 (r37031)
+++ trunk/gui/interface.c Fri Mar 21 16:01:48 2014 (r37032)
@@ -404,7 +404,7 @@ int gui(int what, void *data)
usec_sleep(20000);
wsEvents();
- if (guiInfo.NewPlay == GUI_FILE_NEW) {
+ if (guiInfo.NewPlay == GUI_MEDIUM_NEW) {
audio_id = -1;
video_id = -1;
dvdsub_id = -1;
@@ -593,7 +593,7 @@ int gui(int what, void *data)
if (guiInfo.AudioFilename)
audio_stream = gstrdup(guiInfo.AudioFilename);
- else if (guiInfo.NewPlay == GUI_FILE_NEW)
+ else if (guiInfo.NewPlay == GUI_MEDIUM_NEW)
nfree(audio_stream);
// audio_stream = NULL;
@@ -807,10 +807,10 @@ int gui(int what, void *data)
if (next) {
uiSetFile(next->path, next->name, STREAMTYPE_FILE);
- guiInfo.NewPlay = GUI_FILE_NEW;
+ guiInfo.NewPlay = GUI_MEDIUM_NEW;
guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next);
} else {
- if (guiInfo.NewPlay == GUI_FILE_NEW)
+ if (guiInfo.NewPlay == GUI_MEDIUM_NEW)
break;
filename = NULL;
Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h Fri Mar 21 15:51:39 2014 (r37031)
+++ trunk/gui/interface.h Fri Mar 21 16:01:48 2014 (r37032)
@@ -69,8 +69,8 @@ enum {
//@{
/// NewPlay reason
-#define GUI_FILE_SAME 1
-#define GUI_FILE_NEW 2
+#define GUI_MEDIUM_SAME 1
+#define GUI_MEDIUM_NEW 2
//@}
/// mplayer() instructions
Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c Fri Mar 21 15:51:39 2014 (r37031)
+++ trunk/gui/ui/actions.c Fri Mar 21 16:01:48 2014 (r37032)
@@ -199,7 +199,7 @@ play:
if (!guiInfo.Track)
guiInfo.Track = 1;
- guiInfo.NewPlay = GUI_FILE_NEW;
+ guiInfo.NewPlay = GUI_MEDIUM_NEW;
guiInfo.PlaylistNext = !guiInfo.Playing;
break;
@@ -213,7 +213,7 @@ play:
if (!guiInfo.Track)
guiInfo.Track = (guiInfo.StreamType == STREAMTYPE_VCD ? 2 : 1);
- guiInfo.NewPlay = GUI_FILE_SAME;
+ guiInfo.NewPlay = GUI_MEDIUM_SAME;
break;
}
Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c Fri Mar 21 15:51:39 2014 (r37031)
+++ trunk/gui/win32/interface.c Fri Mar 21 16:01:48 2014 (r37032)
@@ -212,7 +212,7 @@ static void guiSetEvent(int event)
guiInfo.Track = 1;
guiInfo.Chapter = 1;
guiInfo.Angle = 1;
- guiInfo.NewPlay = GUI_FILE_SAME;
+ guiInfo.NewPlay = GUI_MEDIUM_SAME;
#ifdef __WINE__
// dvd_device is in the Windows style (D:\), which needs to be
@@ -356,13 +356,13 @@ static void guiSetEvent(int event)
{
case STREAMTYPE_DVD:
{
- guiInfo.NewPlay = GUI_FILE_SAME;
+ guiInfo.NewPlay = GUI_MEDIUM_SAME;
gui(GUI_SET_STATE, (void *) GUI_PLAY);
break;
}
default:
{
- guiInfo.NewPlay = GUI_FILE_NEW;
+ guiInfo.NewPlay = GUI_MEDIUM_NEW;
update_playlistwindow();
guiInfo.PlaylistNext = guiInfo.Playing? 0 : 1;
gui(GUI_SET_STATE, (void *) GUI_STOP);
@@ -391,7 +391,7 @@ void uiPlay( void )
uiPause();
return;
}
- guiInfo.NewPlay = GUI_FILE_NEW;
+ guiInfo.NewPlay = GUI_MEDIUM_NEW;
gui(GUI_SET_STATE, (void *) GUI_PLAY);
}
@@ -779,12 +779,12 @@ int gui(int what, void *data)
movie_aspect = -1;
guiInfo.PlaylistNext = TRUE;
- guiInfo.NewPlay = GUI_FILE_NEW;
+ guiInfo.NewPlay = GUI_MEDIUM_NEW;
uiSetFile(NULL, mygui->playlist->tracks[(mygui->playlist->current)++]->filename, STREAMTYPE_FILE);
//sprintf(guiInfo.Filename, mygui->playlist->tracks[(mygui->playlist->current)++]->filename);
}
- if(guiInfo.NewPlay == GUI_FILE_NEW)
+ if(guiInfo.NewPlay == GUI_MEDIUM_NEW)
break;
guiInfo.ElapsedTime = 0;
Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c Fri Mar 21 15:51:39 2014 (r37031)
+++ trunk/mplayer.c Fri Mar 21 16:01:48 2014 (r37032)
@@ -4139,7 +4139,7 @@ goto_next_file: // don't jump here afte
#ifdef CONFIG_GUI
if (use_gui)
- if (guiInfo.NewPlay != GUI_FILE_SAME)
+ if (guiInfo.NewPlay != GUI_MEDIUM_SAME)
gui(GUI_END_FILE, 0);
#endif
More information about the MPlayer-cvslog
mailing list