changeset 33289:be7d8c249dfd

Cosmetic: uncrustify related indent adjustments Comments may now be nicely indented after the mp-uncrustify-style.cfg update. Slightly change audio_equ_row definition so that uncrustify doesn't get confused and does proper indenting.
author ib
date Thu, 05 May 2011 11:56:34 +0000
parents 97eb01954e60
children 10fae2d68e7f
files gui/cfg.c gui/interface.c
diffstat 2 files changed, 64 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/gui/cfg.c	Thu May 05 11:13:33 2011 +0000
+++ b/gui/cfg.c	Thu May 05 11:56:34 2011 +0000
@@ -146,82 +146,82 @@
     { "equ_channel_6",               &gtkEquChannel6,          CONF_TYPE_STRING,      0,          0,     0,       NULL },
 
 #define audio_equ_row(i, j) \
-    { "equ_band_" # i # j,           &gtkEquChannels[i][j],    CONF_TYPE_FLOAT,       CONF_RANGE, -15.0, 15.0,    NULL },
-    audio_equ_row(0, 0) audio_equ_row(0, 1) audio_equ_row(0, 2) audio_equ_row(0, 3) audio_equ_row(0, 4) audio_equ_row(0, 5) audio_equ_row(0, 6) audio_equ_row(0, 7) audio_equ_row(0, 8) audio_equ_row(0, 9)
-    audio_equ_row(1, 0) audio_equ_row(1, 1) audio_equ_row(1, 2) audio_equ_row(1, 3) audio_equ_row(1, 4) audio_equ_row(1, 5) audio_equ_row(1, 6) audio_equ_row(1, 7) audio_equ_row(1, 8) audio_equ_row(1, 9)
-    audio_equ_row(2, 0) audio_equ_row(2, 1) audio_equ_row(2, 2) audio_equ_row(2, 3) audio_equ_row(2, 4) audio_equ_row(2, 5) audio_equ_row(2, 6) audio_equ_row(2, 7) audio_equ_row(2, 8) audio_equ_row(2, 9)
-    audio_equ_row(3, 0) audio_equ_row(3, 1) audio_equ_row(3, 2) audio_equ_row(3, 3) audio_equ_row(3, 4) audio_equ_row(3, 5) audio_equ_row(3, 6) audio_equ_row(3, 7) audio_equ_row(3, 8) audio_equ_row(3, 9)
-    audio_equ_row(4, 0) audio_equ_row(4, 1) audio_equ_row(4, 2) audio_equ_row(4, 3) audio_equ_row(4, 4) audio_equ_row(4, 5) audio_equ_row(4, 6) audio_equ_row(4, 7) audio_equ_row(4, 8) audio_equ_row(4, 9)
-    audio_equ_row(5, 0) audio_equ_row(5, 1) audio_equ_row(5, 2) audio_equ_row(5, 3) audio_equ_row(5, 4) audio_equ_row(5, 5) audio_equ_row(5, 6) audio_equ_row(5, 7) audio_equ_row(5, 8) audio_equ_row(5, 9)
+    { "equ_band_" # i # j,           &gtkEquChannels[i][j],    CONF_TYPE_FLOAT,       CONF_RANGE, -15.0, 15.0,    NULL }
+    audio_equ_row(0, 0), audio_equ_row(0, 1), audio_equ_row(0, 2), audio_equ_row(0, 3), audio_equ_row(0, 4), audio_equ_row(0, 5), audio_equ_row(0, 6), audio_equ_row(0, 7), audio_equ_row(0, 8), audio_equ_row(0, 9),
+    audio_equ_row(1, 0), audio_equ_row(1, 1), audio_equ_row(1, 2), audio_equ_row(1, 3), audio_equ_row(1, 4), audio_equ_row(1, 5), audio_equ_row(1, 6), audio_equ_row(1, 7), audio_equ_row(1, 8), audio_equ_row(1, 9),
+    audio_equ_row(2, 0), audio_equ_row(2, 1), audio_equ_row(2, 2), audio_equ_row(2, 3), audio_equ_row(2, 4), audio_equ_row(2, 5), audio_equ_row(2, 6), audio_equ_row(2, 7), audio_equ_row(2, 8), audio_equ_row(2, 9),
+    audio_equ_row(3, 0), audio_equ_row(3, 1), audio_equ_row(3, 2), audio_equ_row(3, 3), audio_equ_row(3, 4), audio_equ_row(3, 5), audio_equ_row(3, 6), audio_equ_row(3, 7), audio_equ_row(3, 8), audio_equ_row(3, 9),
+    audio_equ_row(4, 0), audio_equ_row(4, 1), audio_equ_row(4, 2), audio_equ_row(4, 3), audio_equ_row(4, 4), audio_equ_row(4, 5), audio_equ_row(4, 6), audio_equ_row(4, 7), audio_equ_row(4, 8), audio_equ_row(4, 9),
+    audio_equ_row(5, 0), audio_equ_row(5, 1), audio_equ_row(5, 2), audio_equ_row(5, 3), audio_equ_row(5, 4), audio_equ_row(5, 5), audio_equ_row(5, 6), audio_equ_row(5, 7), audio_equ_row(5, 8), audio_equ_row(5, 9),
 #undef audio_equ_row
 
-    { "playbar", &gtkEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL },
-    { "load_fullscreen", &gtkLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL },
-    { "show_videowin", &gtkShowVideoWindow, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+    { "playbar",                     &gtkEnablePlayBar,        CONF_TYPE_FLAG,        0,          0,     1,       NULL },
+    { "load_fullscreen",             &gtkLoadFullscreen,       CONF_TYPE_FLAG,        0,          0,     1,       NULL },
+    { "show_videowin",               &gtkShowVideoWindow,      CONF_TYPE_FLAG,        0,          0,     1,       NULL },
 
-    { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG, 0, 0, 1, NULL },
-    { "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL },
-    { "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL },
-    { "gui_video_out_pos_x", &gui_sub_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL },
-    { "gui_video_out_pos_y", &gui_sub_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL },
+    { "gui_save_pos",                &gui_save_pos,            CONF_TYPE_FLAG,        0,          0,     1,       NULL },
+    { "gui_main_pos_x",              &gui_main_pos_x,          CONF_TYPE_INT,         0,          0,     0,       NULL },
+    { "gui_main_pos_y",              &gui_main_pos_y,          CONF_TYPE_INT,         0,          0,     0,       NULL },
+    { "gui_video_out_pos_x",         &gui_sub_pos_x,           CONF_TYPE_INT,         0,          0,     0,       NULL },
+    { "gui_video_out_pos_y",         &gui_sub_pos_y,           CONF_TYPE_INT,         0,          0,     0,       NULL },
 
     // NOTE TO MYSELF: Do we really need all/any non-gtkOptions, i.e. override mplayer options?
 
-    { "gui_skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL },
+    { "gui_skin",                    &skinName,                CONF_TYPE_STRING,      0,          0,     0,       NULL },
 
-    { "stopxscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+    { "stopxscreensaver",            &stop_xscreensaver,       CONF_TYPE_FLAG,        0,          0,     1,       NULL },
 
-    { "cdrom_device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL },
-    { "dvd_device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL },
+    { "cdrom_device",                &cdrom_device,            CONF_TYPE_STRING,      0,          0,     0,       NULL },
+    { "dvd_device",                  &dvd_device,              CONF_TYPE_STRING,      0,          0,     0,       NULL },
 
-    { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL },
+    { "osd_level",                   &osd_level,               CONF_TYPE_INT,         CONF_RANGE, 0,     3,       NULL },
 
-    { "vo_driver", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
-    { "v_vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
+    { "vo_driver",                   &video_driver_list,       CONF_TYPE_STRING_LIST, 0,          0,     0,       NULL },
+    { "v_vfm",                       &video_fm_list,           CONF_TYPE_STRING_LIST, 0,          0,     0,       NULL },
 
-    { "vf_autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL },
-    { "vo_direct_render", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL },
-    { "vo_doublebuffering", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL },
-    { "vo_panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL },
+    { "vf_autoq",                    &auto_quality,            CONF_TYPE_INT,         CONF_RANGE, 0,     100,     NULL },
+    { "vo_direct_render",            &vo_directrendering,      CONF_TYPE_FLAG,        0,          0,     1,       NULL },
+    { "vo_doublebuffering",          &vo_doublebuffering,      CONF_TYPE_FLAG,        0,          0,     1,       NULL },
+    { "vo_panscan",                  &vo_panscan,              CONF_TYPE_FLOAT,       CONF_RANGE, 0.0,   1.0,     NULL },
 
-    { "v_flip", &flip, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL },
-    { "v_framedrop", &frame_dropping, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL },
-    { "v_idx", &index_mode, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL },
-    { "v_ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+    { "v_flip",                      &flip,                    CONF_TYPE_INT,         CONF_RANGE, -1,    1,       NULL },
+    { "v_framedrop",                 &frame_dropping,          CONF_TYPE_INT,         CONF_RANGE, 0,     2,       NULL },
+    { "v_idx",                       &index_mode,              CONF_TYPE_INT,         CONF_RANGE, -1,    2,       NULL },
+    { "v_ni",                        &force_ni,                CONF_TYPE_FLAG,        0,          0,     1,       NULL },
 
-    { "ao_driver", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
-    { "a_afm", &audio_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
+    { "ao_driver",                   &audio_driver_list,       CONF_TYPE_STRING_LIST, 0,          0,     0,       NULL },
+    { "a_afm",                       &audio_fm_list,           CONF_TYPE_STRING_LIST, 0,          0,     0,       NULL },
 
-    { "softvol", &soft_vol, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+    { "softvol",                     &soft_vol,                CONF_TYPE_FLAG,        0,          0,     1,       NULL },
 
-    { "sub_auto_load", &sub_auto, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+    { "sub_auto_load",               &sub_auto,                CONF_TYPE_FLAG,        0,          0,     1,       NULL },
 #ifdef CONFIG_ICONV
-    { "sub_cp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL },
+    { "sub_cp",                      &sub_cp,                  CONF_TYPE_STRING,      0,          0,     0,       NULL },
 #endif
-    { "sub_overlap", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 0, NULL },
-    { "sub_pos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 200, NULL },
-    { "sub_unicode", &sub_unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+    { "sub_overlap",                 &suboverlap_enabled,      CONF_TYPE_FLAG,        0,          0,     0,       NULL },
+    { "sub_pos",                     &sub_pos,                 CONF_TYPE_INT,         CONF_RANGE, 0,     200,     NULL },
+    { "sub_unicode",                 &sub_unicode,             CONF_TYPE_FLAG,        0,          0,     1,       NULL },
 
-    { "font_factor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL },
-    { "font_name", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL },
+    { "font_factor",                 &font_factor,             CONF_TYPE_FLOAT,       CONF_RANGE, 0.0,   10.0,    NULL },
+    { "font_name",                   &font_name,               CONF_TYPE_STRING,      0,          0,     0,       NULL },
 
 #ifdef CONFIG_FREETYPE
-    { "font_encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL },
-    { "font_text_scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL },
-    { "font_osd_scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL },
-    { "font_blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0, 8, NULL },
-    { "font_outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0, 8, NULL },
-    { "font_autoscale", &subtitle_autoscale, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL },
+    { "font_encoding",               &subtitle_font_encoding,  CONF_TYPE_STRING,      0,          0,     0,       NULL },
+    { "font_text_scale",             &text_font_scale_factor,  CONF_TYPE_FLOAT,       CONF_RANGE, 0,     100,     NULL },
+    { "font_osd_scale",              &osd_font_scale_factor,   CONF_TYPE_FLOAT,       CONF_RANGE, 0,     100,     NULL },
+    { "font_blur",                   &subtitle_font_radius,    CONF_TYPE_FLOAT,       CONF_RANGE, 0,     8,       NULL },
+    { "font_outline",                &subtitle_font_thickness, CONF_TYPE_FLOAT,       CONF_RANGE, 0,     8,       NULL },
+    { "font_autoscale",              &subtitle_autoscale,      CONF_TYPE_INT,         CONF_RANGE, 0,     3,       NULL },
 #endif
 
 #ifdef CONFIG_ASS
-    { "ass_enabled", &ass_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL },
-    { "ass_use_margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 0, 1, NULL },
-    { "ass_top_margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL },
-    { "ass_bottom_margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL },
+    { "ass_enabled",                 &ass_enabled,             CONF_TYPE_FLAG,        0,          0,     1,       NULL },
+    { "ass_use_margins",             &ass_use_margins,         CONF_TYPE_FLAG,        0,          0,     1,       NULL },
+    { "ass_top_margin",              &ass_top_margin,          CONF_TYPE_INT,         CONF_RANGE, 0,     512,     NULL },
+    { "ass_bottom_margin",           &ass_bottom_margin,       CONF_TYPE_INT,         CONF_RANGE, 0,     512,     NULL },
 #endif
 
-    { NULL, NULL, 0, 0, 0, 0, NULL }
+    { NULL,                          NULL,                     0,                     0,          0,     0,       NULL }
 };
 
 static char *gfgets(char *str, int size, FILE *f)
--- a/gui/interface.c	Thu May 05 11:13:33 2011 +0000
+++ b/gui/interface.c	Thu May 05 11:56:34 2011 +0000
@@ -410,13 +410,13 @@
 }
 
 // NOTE TO MYSELF: Before calling guiInit(), MPlayer calls GUI functions
-// cfg_read() and import_initial_playtree_into_gui(). Only
-// after guiInit() has been called successfully, guiDone()
-// (and thus guiExit()) will be executed by MPlayer on exit.
-// In other words, any MPlayer's exit between cfg_read() and
-// guiInit() will not execute guiDone().
-// With this function it is at least possible to handle
-// GUI's own abortions during (and before) guiInit().
+//                 cfg_read() and import_initial_playtree_into_gui(). Only
+//                 after guiInit() has been called successfully, guiDone()
+//                 (and thus guiExit()) will be executed by MPlayer on exit.
+//                 In other words, any MPlayer's exit between cfg_read() and
+//                 guiInit() will not execute guiDone().
+//                 With this function it is at least possible to handle
+//                 GUI's own abortions during (and before) guiInit().
 void guiExit(int how)
 {
     if (!initialized || (how == DONE)) {
@@ -1489,12 +1489,12 @@
 }
 
 // NOTE TO MYSELF: This function is nonsense.
-// MPlayer should pass messages to the GUI
-// which must decide then which message has
-// to be shown (MSGL_FATAL, for example).
-// But with this function it is at least
-// possible to show GUI's very critical or
-// abort messages.
+//                 MPlayer should pass messages to the GUI
+//                 which must decide then which message has
+//                 to be shown (MSGL_FATAL, for example).
+//                 But with this function it is at least
+//                 possible to show GUI's very critical or
+//                 abort messages.
 void gmp_msg(int mod, int lev, const char *format, ...)
 {
     char msg[512];