[MPlayer-cvslog] r32474 - trunk/mpcommon.c

[reimar]

Author: reimar
Date: Sat Oct  9 17:51:28 2010
New Revision: 32474

Log:
Whitespace cosmetics: format init function more consistent with the
rest of mpcommon.c

Modified:
   trunk/mpcommon.c

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Sat Oct  9 17:46:17 2010	(r32473)
+++ trunk/mpcommon.c	Sat Oct  9 17:51:28 2010	(r32474)
@@ -399,11 +399,11 @@ int common_init(void)
 #endif
 #ifdef CONFIG_GUI
     void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows");
-    if(runningmplayer && filename && use_gui){
+    if (runningmplayer && filename && use_gui) {
         COPYDATASTRUCT csData;
         char file[MAX_PATH];
         char *filepart = filename;
-        if(GetFullPathName(filename, MAX_PATH, file, &filepart)){
+        if (GetFullPathName(filename, MAX_PATH, file, &filepart)) {
             csData.dwData = 0;
             csData.cbData = strlen(file)*2;
             csData.lpData = file;
@@ -422,17 +422,17 @@ int common_init(void)
         set_codec_path(codec_path);
 
     /* Check codecs.conf. */
-    if(!codecs_file || !parse_codec_cfg(codecs_file)){
+    if (!codecs_file || !parse_codec_cfg(codecs_file)) {
         char *mem_ptr;
-        if(!parse_codec_cfg(mem_ptr=get_path("codecs.conf"))){
-            if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
-                if(!parse_codec_cfg(NULL)){
+        if (!parse_codec_cfg(mem_ptr = get_path("codecs.conf"))) {
+            if (!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")) {
+                if (!parse_codec_cfg(NULL)) {
                     return 0;
                 }
                 mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_BuiltinCodecsConf);
             }
         }
-        free( mem_ptr ); // release the buffer created by get_path()
+        free(mem_ptr); // release the buffer created by get_path()
     }
 
     // check font
@@ -440,22 +440,22 @@ int common_init(void)
     init_freetype();
 #endif
 #ifdef CONFIG_FONTCONFIG
-    if(font_fontconfig <= 0)
+    if (font_fontconfig <= 0)
 #endif
     {
 #ifdef CONFIG_BITMAP_FONT
-        if(font_name){
-            vo_font=read_font_desc(font_name,font_factor,verbose>1);
-            if(!vo_font)
+        if (font_name) {
+            vo_font = read_font_desc(font_name, font_factor, verbose>1);
+            if (!vo_font)
                 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,
                        filename_recode(font_name));
         } else {
             char *mem_ptr;
             // try default:
-            vo_font=read_font_desc( mem_ptr=get_path("font/font.desc"),font_factor,verbose>1);
+            vo_font = read_font_desc(mem_ptr = get_path("font/font.desc"), font_factor, verbose>1);
             free(mem_ptr); // release the buffer created by get_path()
-            if(!vo_font)
-                vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
+            if (!vo_font)
+                vo_font = read_font_desc(MPLAYER_DATADIR "/font/font.desc", font_factor, verbose>1);
         }
         if (sub_font_name)
             sub_font = read_font_desc(sub_font_name, font_factor, verbose>1);