[MPlayer-cvslog] r33851 - in trunk/gui: interface.c interface.h ui/gtk/fileselect.c ui/main.c win32/dialogs.c

[ib]

Author: ib
Date: Fri Jul  8 23:04:56 2011
New Revision: 33851

Log:
Cosmetic: Rename two functions that do MPlayer calls.

Rename guiLoadFont() mplayerLoadFont()
and guiLoadSubtitle() mplayerLoadSubtitle().

Modified:
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/ui/gtk/fileselect.c
   trunk/gui/ui/main.c
   trunk/gui/win32/dialogs.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Fri Jul  8 13:59:07 2011	(r33850)
+++ trunk/gui/interface.c	Fri Jul  8 23:04:56 2011	(r33851)
@@ -275,7 +275,7 @@ void guiInit(void)
     if (subdata)
         setdup(&guiInfo.Subtitlename, subdata->filename);
 
-    guiLoadFont();
+    mplayerLoadFont();
 
     initialized = 1;
 }
@@ -616,7 +616,7 @@ int gui(int what, void *arg)
             stream_dump_type = 6;
 
         gtkSubDumpMPSub = gtkSubDumpSrt = 0;
-        guiLoadFont();
+        mplayerLoadFont();
 
         // misc
 
@@ -943,38 +943,38 @@ void mplayer(int cmd, float fparam, void
 #ifndef CONFIG_FREETYPE
     case gtkSetFontFactor:
         font_factor = fparam;
-        guiLoadFont();
+        mplayerLoadFont();
         break;
 #else
     case gtkSetFontOutLine:
         subtitle_font_thickness = (8.0f / 100.0f) * fparam;
-        guiLoadFont();
+        mplayerLoadFont();
         break;
 
     case gtkSetFontBlur:
         subtitle_font_radius = (8.0f / 100.0f) * fparam;
-        guiLoadFont();
+        mplayerLoadFont();
         break;
 
     case gtkSetFontTextScale:
         text_font_scale_factor = fparam;
-        guiLoadFont();
+        mplayerLoadFont();
         break;
 
     case gtkSetFontOSDScale:
         osd_font_scale_factor = fparam;
-        guiLoadFont();
+        mplayerLoadFont();
         break;
 
     case gtkSetFontEncoding:
         nfree(subtitle_font_encoding);
         subtitle_font_encoding = gstrdup((char *)vparam);
-        guiLoadFont();
+        mplayerLoadFont();
         break;
 
     case gtkSetFontAutoScale:
         subtitle_autoscale = (int)fparam;
-        guiLoadFont();
+        mplayerLoadFont();
         break;
 #endif
 
@@ -1083,7 +1083,7 @@ void mplayer(int cmd, float fparam, void
     }
 }
 
-void guiLoadFont(void)
+void mplayerLoadFont(void)
 {
 #ifdef CONFIG_FREETYPE
     load_font_ft(vo_image_width, vo_image_height, &vo_font, font_name, osd_font_scale_factor);
@@ -1130,7 +1130,7 @@ void guiLoadFont(void)
 #endif
 }
 
-void guiLoadSubtitle(char *name)
+void mplayerLoadSubtitle(char *name)
 {
     if (guiInfo.Playing == 0) {
         guiInfo.SubtitleChanged = 1; // what is this for? (mw)

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Fri Jul  8 13:59:07 2011	(r33850)
+++ trunk/gui/interface.h	Fri Jul  8 23:04:56 2011	(r33851)
@@ -187,7 +187,7 @@ int guiPlaylistAdd(play_tree_t *my_playt
 void gmp_msg(int mod, int lev, const char *format, ...);
 void mplayer(int cmd, float fparam, void *vparam);
 void guiExit(enum exit_reason how);
-void guiLoadFont(void);
-void guiLoadSubtitle(char *name);
+void mplayerLoadFont(void);
+void mplayerLoadSubtitle(char *name);
 
 #endif /* MPLAYER_GUI_INTERFACE_H */

Modified: trunk/gui/ui/gtk/fileselect.c
==============================================================================
--- trunk/gui/ui/gtk/fileselect.c	Fri Jul  8 13:59:07 2011	(r33850)
+++ trunk/gui/ui/gtk/fileselect.c	Fri Jul  8 23:04:56 2011	(r33851)
@@ -488,7 +488,7 @@ static void fs_Ok_released( GtkButton * 
           break;
    case fsSubtitleSelector:
           setddup( &guiInfo.Subtitlename,fsSelectedDirectory,fsSelectedFile );
-	  guiLoadSubtitle( guiInfo.Subtitlename );
+	  mplayerLoadSubtitle( guiInfo.Subtitlename );
           break;
    case fsOtherSelector:
           setddup( &guiInfo.Othername,fsSelectedDirectory,fsSelectedFile );
@@ -498,7 +498,7 @@ static void fs_Ok_released( GtkButton * 
           break;
    case fsFontSelector:
           setddup( &font_name,fsSelectedDirectory,fsSelectedFile );
-	  guiLoadFont();
+	  mplayerLoadFont();
 	  if ( Preferences ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name );
 	  break;
   }

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Fri Jul  8 13:59:07 2011	(r33850)
+++ trunk/gui/ui/main.c	Fri Jul  8 23:04:56 2011	(r33851)
@@ -246,7 +246,7 @@ NoPause:
    case evLoadSubtitle:  gtkShow( evLoadSubtitle,NULL );  break;
    case evDropSubtitle:
 	nfree( guiInfo.Subtitlename );
-	guiLoadSubtitle( NULL );
+	mplayerLoadSubtitle( NULL );
 	break;
    case evLoadAudioFile: gtkShow( evLoadAudioFile,NULL ); break;
    case evPrev: uiPrev(); break;
@@ -636,6 +636,6 @@ void uiDandDHandler(int num,char** files
   if (subtitles) {
     nfree(guiInfo.Subtitlename);
     guiInfo.Subtitlename = subtitles;
-    guiLoadSubtitle(guiInfo.Subtitlename);
+    mplayerLoadSubtitle(guiInfo.Subtitlename);
   }
 }

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	Fri Jul  8 13:59:07 2011	(r33850)
+++ trunk/gui/win32/dialogs.c	Fri Jul  8 23:04:56 2011	(r33851)
@@ -45,7 +45,7 @@ int get_video_colors(sh_video_t *sh_vide
 guiInterface_t guiInfo;
 int addurl = 0;
 
-void guiLoadSubtitle(char *name)
+void mplayerLoadSubtitle(char *name)
 {
     if (!guiInfo.Playing)
     {
@@ -178,7 +178,7 @@ void display_opensubtitlewindow(gui_t *g
     subtitleopen.nMaxFile = MAXFILE;
 
     if(GetOpenFileName(&subtitleopen))
-        guiLoadSubtitle(subtitlefile);
+        mplayerLoadSubtitle(subtitlefile);
 }
 
 static void display_loadplaylistwindow(gui_t *gui)