[MPlayer-cvslog] r34796 - trunk/gui/cfg.c
ib
subversion at mplayerhq.hu
Sun Mar 4 16:38:46 CET 2012
Author: ib
Date: Sun Mar 4 16:38:45 2012
New Revision: 34796
Log:
Cosmetic: Adjust indent.
Modified:
trunk/gui/cfg.c
Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c Sun Mar 4 16:37:30 2012 (r34795)
+++ trunk/gui/cfg.c Sun Mar 4 16:38:45 2012 (r34796)
@@ -104,55 +104,55 @@ static const char gui_playlist[] =
static const char gui_urllist[] = "gui.url";
static const m_option_t gui_opts[] = {
- { "cache", >kCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "cache", >kCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL },
{ "cache_size", >kCacheSize, CONF_TYPE_INT, CONF_RANGE, 32, 0x7fffffff, NULL },
- { "vf_pp", >kVfPP, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "vf_pp", >kVfPP, CONF_TYPE_FLAG, 0, 0, 1, NULL },
#ifdef CONFIG_DXR3
- { "vf_lavc", >kVfLAVC, CONF_TYPE_FLAG, 0, 0, 1, NULL },
- { "vo_dxr3_device", >kDXR3Device, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "vf_lavc", >kVfLAVC, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "vo_dxr3_device", >kDXR3Device, CONF_TYPE_STRING, 0, 0, 0, NULL },
#endif
- { "autosync", >kAutoSyncOn, CONF_TYPE_FLAG, 0, 0, 1, NULL },
- { "autosync_size", >kAutoSync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL },
+ { "autosync", >kAutoSyncOn, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "autosync_size", >kAutoSync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL },
- { "ao_volnorm", >kAONorm, CONF_TYPE_FLAG, 0, 0, 1, NULL },
- { "ao_surround", >kAOSurround, CONF_TYPE_FLAG, 0, 0, 1, NULL },
- { "ao_extra_stereo", >kAOExtraStereo, CONF_TYPE_FLAG, 0, 0, 1, NULL },
- { "ao_extra_stereo_coefficient", >kAOExtraStereoMul, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL },
+ { "ao_volnorm", >kAONorm, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "ao_surround", >kAOSurround, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "ao_extra_stereo", >kAOExtraStereo, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "ao_extra_stereo_coefficient", >kAOExtraStereoMul, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL },
#ifdef CONFIG_ALSA
- { "ao_alsa_mixer", >kAOALSAMixer, CONF_TYPE_STRING, 0, 0, 0, NULL },
- { "ao_alsa_mixer_channel", >kAOALSAMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL },
- { "ao_alsa_device", >kAOALSADevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "ao_alsa_mixer", >kAOALSAMixer, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "ao_alsa_mixer_channel", >kAOALSAMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "ao_alsa_device", >kAOALSADevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
#endif
#ifdef CONFIG_OSS_AUDIO
- { "ao_oss_mixer", >kAOOSSMixer, CONF_TYPE_STRING, 0, 0, 0, NULL },
- { "ao_oss_mixer_channel", >kAOOSSMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL },
- { "ao_oss_device", >kAOOSSDevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "ao_oss_mixer", >kAOOSSMixer, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "ao_oss_mixer_channel", >kAOOSSMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "ao_oss_device", >kAOOSSDevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
#endif
#ifdef CONFIG_ESD
- { "ao_esd_device", >kAOESDDevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "ao_esd_device", >kAOESDDevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
#endif
#ifdef CONFIG_SDL
- { "ao_sdl_subdriver", >kAOSDLDriver, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "ao_sdl_subdriver", >kAOSDLDriver, CONF_TYPE_STRING, 0, 0, 0, NULL },
#endif
- { "enable_audio_equ", >kEnableAudioEqualizer, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "enable_audio_equ", >kEnableAudioEqualizer, CONF_TYPE_FLAG, 0, 0, 1, NULL },
- { "equ_channel_1", >kEquChannel1, CONF_TYPE_STRING, 0, 0, 0, NULL },
- { "equ_channel_2", >kEquChannel2, CONF_TYPE_STRING, 0, 0, 0, NULL },
- { "equ_channel_3", >kEquChannel3, CONF_TYPE_STRING, 0, 0, 0, NULL },
- { "equ_channel_4", >kEquChannel4, CONF_TYPE_STRING, 0, 0, 0, NULL },
- { "equ_channel_5", >kEquChannel5, CONF_TYPE_STRING, 0, 0, 0, NULL },
- { "equ_channel_6", >kEquChannel6, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "equ_channel_1", >kEquChannel1, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "equ_channel_2", >kEquChannel2, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "equ_channel_3", >kEquChannel3, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "equ_channel_4", >kEquChannel4, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "equ_channel_5", >kEquChannel5, CONF_TYPE_STRING, 0, 0, 0, NULL },
+ { "equ_channel_6", >kEquChannel6, CONF_TYPE_STRING, 0, 0, 0, NULL },
#define audio_equ_row(i, j) \
- { "equ_band_" # i # j, >kEquChannels[i][j], CONF_TYPE_FLOAT, CONF_RANGE, -15.0, 15.0, NULL }
+ { "equ_band_" # i # j, >kEquChannels[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),
@@ -161,75 +161,75 @@ static const m_option_t gui_opts[] = {
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", >kEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL },
- { "load_fullscreen", >kLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL },
- { "show_videowin", >kShowVideoWindow, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "playbar", >kEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "load_fullscreen", >kLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "show_videowin", >kShowVideoWindow, 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_video_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL },
- { "gui_video_out_pos_y", &gui_video_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_video_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL },
+ { "gui_video_out_pos_y", &gui_video_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL },
- { "idle", &player_idle_mode, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
+ { "idle", &player_idle_mode, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, 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.0, 100.0, NULL },
- { "font_osd_scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 100.0, NULL },
- { "font_blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, NULL },
- { "font_outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, 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.0, 100.0, NULL },
+ { "font_osd_scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 100.0, NULL },
+ { "font_blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, NULL },
+ { "font_outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, 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 }
};
int cfg_gui_include(m_option_t *conf, const char *filename)
More information about the MPlayer-cvslog
mailing list