[MPlayer-cvslog] r38090 - in trunk/gui/dialog: dialog.c fileselect.c fileselect.h

[ib]

Author: ib
Date: Fri Apr 13 15:49:37 2018
New Revision: 38090

Log:
Rename FILESELECT_AUDIO FILESELECT_AUDIO_TRACK.

This is more accurate.

Modified:
   trunk/gui/dialog/dialog.c
   trunk/gui/dialog/fileselect.c
   trunk/gui/dialog/fileselect.h

Modified: trunk/gui/dialog/dialog.c
==============================================================================
--- trunk/gui/dialog/dialog.c	Fri Apr 13 15:43:04 2018	(r38089)
+++ trunk/gui/dialog/dialog.c	Fri Apr 13 15:49:37 2018	(r38090)
@@ -302,7 +302,7 @@ void gtkShow(int type, char *param)
         break;
 
     case evLoadAudioFile:
-        ShowFileSelector(FILESELECT_AUDIO);
+        ShowFileSelector(FILESELECT_AUDIO_TRACK);
         gtkSetLayer(FileSelector);
         break;
 

Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c	Fri Apr 13 15:43:04 2018	(r38089)
+++ trunk/gui/dialog/fileselect.c	Fri Apr 13 15:49:37 2018	(r38090)
@@ -259,7 +259,7 @@ static void fs_get_pixmap(const char *ex
         *mask   = smask;
         break;
 
-    case FILESELECT_AUDIO:
+    case FILESELECT_AUDIO_TRACK:
         if (!atpixmap)
             atpixmap = gdk_pixmap_colormap_create_from_xpm_d(FileSelector->window, fsColorMap, &atmask, &style->bg[GTK_STATE_NORMAL], (gchar **)file_audio_track_xpm);
         *pixmap = atpixmap;
@@ -466,7 +466,7 @@ static void fs_fsFilterCombo_changed(Gtk
 
         break;
 
-    case FILESELECT_AUDIO:
+    case FILESELECT_AUDIO_TRACK:
 
         for (i = 0; fsAudioFileNames[i][0]; i++)
             if (strcmp(str, fsAudioFileNames[i][0]) == 0) {
@@ -632,7 +632,7 @@ static void fs_Ok_released(GtkButton *bu
         setddup(&guiInfo.SubtitleFilename, fsSelectedDirectory, fsSelectedFile);
         break;
 
-    case FILESELECT_AUDIO:
+    case FILESELECT_AUDIO_TRACK:
         setddup(&guiInfo.AudioFilename, fsSelectedDirectory, fsSelectedFile);
         break;
 
@@ -893,7 +893,7 @@ void ShowFileSelector(int type)
         tmp = guiInfo.SubtitleFilename;
         break;
 
-    case FILESELECT_AUDIO:
+    case FILESELECT_AUDIO_TRACK:
         gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_GUI_SelectAudioFile);
         fsList_items = NULL;
 
@@ -936,7 +936,7 @@ void ShowFileSelector(int type)
         break;
     }
 
-    fsMedium = (fsType == FILESELECT_VIDEO_AUDIO || fsType == FILESELECT_SUBTITLE || fsType == FILESELECT_AUDIO || fsType == FILESELECT_IMAGE);
+    fsMedium = (fsType == FILESELECT_VIDEO_AUDIO || fsType == FILESELECT_SUBTITLE || fsType == FILESELECT_AUDIO_TRACK || fsType == FILESELECT_IMAGE);
 
     if (tmp && tmp[0] && !strstr(tmp, "://")) {
         dir = strdup(tmp);

Modified: trunk/gui/dialog/fileselect.h
==============================================================================
--- trunk/gui/dialog/fileselect.h	Fri Apr 13 15:43:04 2018	(r38089)
+++ trunk/gui/dialog/fileselect.h	Fri Apr 13 15:49:37 2018	(r38090)
@@ -25,7 +25,7 @@
 enum {
     FILESELECT_VIDEO_AUDIO,
     FILESELECT_SUBTITLE,
-    FILESELECT_AUDIO,
+    FILESELECT_AUDIO_TRACK,
     FILESELECT_FONT,
     FILESELECT_IMAGE
 };