# HG changeset patch # User ib # Date 1302877858 0 # Node ID 218edd8fc78236482ba0884afdacff4d4b432da9 # Parent cdfb3ba2967fb7b30054a8be4e1a1998e945c6fa Cosmetic: Format to MPlayer coding style. Additionally: remove needless includes, group and sort includes, group and sort variables, rename gtkAOFakeSurround declaration gtkAOSurround, add #ifdefs to variable declarations, group statements by adding or removing new lines to ease reading, move assignments outside conditions, add parentheses, avoid mixing declaration and code, revise comments and add new ones. diff -r cdfb3ba2967f -r 218edd8fc782 gui/cfg.c --- a/gui/cfg.c Fri Apr 15 10:58:36 2011 +0000 +++ b/gui/cfg.c Fri Apr 15 14:30:58 2011 +0000 @@ -20,347 +20,395 @@ #include #include +#include "cfg.h" +#include "interface.h" + #include "config.h" -#include "sub/ass_mp.h" -#include "mp_msg.h" #include "help_mp.h" -#include "mixer.h" -#include "mpcommon.h" -#include "mplayer.h" -#include "m_config.h" -#include "m_option.h" -#include "parser-cfg.h" -#include "path.h" #include "libmpcodecs/vd.h" -#include "sub/sub.h" #include "libvo/video_out.h" #include "libvo/x11_common.h" -#include "stream/stream.h" -#include "libmpdemux/demuxer.h" +#include "m_config.h" +#include "m_option.h" +#include "mixer.h" +#include "mp_msg.h" +#include "mpcommon.h" +#include "mplayer.h" +#include "parser-cfg.h" +#include "path.h" #include "sub/font_load.h" - -#include "cfg.h" -#include "app.h" -#include "interface.h" -#include "mplayer/gmplayer.h" -#include "mplayer/play.h" - -// --- params +#include "sub/sub.h" -int gtkEnableAudioEqualizer = 0; +int gtkEnableAudioEqualizer = 0; -int gtkVfPP = 0; -int gtkVfLAVC = 0; +int gtkVfPP = 0; +int gtkVfLAVC = 0; -int gtkAONorm = 0; -int gtkAOSurround = 0; -int gtkAOExtraStereo = 0; -float gtkAOExtraStereoMul = 1.0; +int gtkAONorm = 0; +int gtkAOSurround = 0; +int gtkAOExtraStereo = 0; +float gtkAOExtraStereoMul = 1.0; #ifdef CONFIG_OSS_AUDIO -char * gtkAOOSSMixer; -char * gtkAOOSSMixerChannel; -char * gtkAOOSSDevice; +char *gtkAOOSSMixer; +char *gtkAOOSSMixerChannel; +char *gtkAOOSSDevice; #endif #ifdef CONFIG_ALSA -char * gtkAOALSAMixer; -char * gtkAOALSAMixerChannel; -char * gtkAOALSADevice; +char *gtkAOALSAMixer; +char *gtkAOALSAMixerChannel; +char *gtkAOALSADevice; #endif #ifdef CONFIG_SDL -char * gtkAOSDLDriver; +char *gtkAOSDLDriver; #endif #ifdef CONFIG_ESD -char * gtkAOESDDevice; +char *gtkAOESDDevice; #endif -int gtkCacheOn = 0; -int gtkCacheSize = 2048; +int gtkCacheOn = 0; +int gtkCacheSize = 2048; -int gtkAutoSyncOn = 0; -int gtkAutoSync = 0; +int gtkAutoSyncOn = 0; +int gtkAutoSync = 0; #ifdef CONFIG_DXR3 - char * gtkDXR3Device; +char *gtkDXR3Device; #endif -int gtkSubDumpMPSub = 0; -int gtkSubDumpSrt = 0; +int gtkSubDumpMPSub = 0; +int gtkSubDumpSrt = 0; -int gtkLoadFullscreen = 0; -int gtkShowVideoWindow = 1; -int gtkEnablePlayBar = 1; +int gtkLoadFullscreen = 0; +int gtkShowVideoWindow = 1; +int gtkEnablePlayBar = 1; -int gui_save_pos = 1; -int gui_main_pos_x = -2; -int gui_main_pos_y = -2; -int gui_sub_pos_x = -1; -int gui_sub_pos_y = -1; +int gui_save_pos = 1; +int gui_main_pos_x = -2; +int gui_main_pos_y = -2; +int gui_sub_pos_x = -1; +int gui_sub_pos_y = -1; #ifdef CONFIG_ASS gtkASS_t gtkASS; #endif -// --- + +static m_config_t *gui_conf; -static m_config_t * gui_conf; -static const m_option_t gui_opts[] = -{ - { "enable_audio_equ",>kEnableAudioEqualizer,CONF_TYPE_FLAG,0,0,1,NULL }, +// NOTE TO MYSELF: Do we really need all/any non-gtkOptions, i.e. override mplayer's ones? +static const m_option_t gui_opts[] = { + { "enable_audio_equ", >kEnableAudioEqualizer, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "vo_driver",&video_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, - { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL }, - { "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL }, - { "vo_direct_render",&vo_directrendering,CONF_TYPE_FLAG,0,0,1,NULL }, + { "vo_driver", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "vo_panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL }, + { "vo_doublebuffering", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "vo_direct_render", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, #ifdef CONFIG_DXR3 - { "vo_dxr3_device",>kDXR3Device,CONF_TYPE_STRING,0,0,0,NULL }, + { "vo_dxr3_device", >kDXR3Device, CONF_TYPE_STRING, 0, 0, 0, NULL }, #endif - { "v_framedrop",&frame_dropping,CONF_TYPE_INT,CONF_RANGE,0,2,NULL }, - { "v_flip",&flip,CONF_TYPE_INT,CONF_RANGE,-1,1,NULL }, - { "v_ni",&force_ni,CONF_TYPE_FLAG,0,0,1,NULL }, - { "v_idx",&index_mode,CONF_TYPE_INT,CONF_RANGE,-1,2,NULL }, - { "v_vfm",&video_fm_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, - { "a_afm",&audio_fm_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, + { "v_framedrop", &frame_dropping, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL }, + { "v_flip", &flip, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL }, + { "v_ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "v_idx", &index_mode, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL }, + { "v_vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "a_afm", &audio_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, - { "vf_pp",>kVfPP,CONF_TYPE_FLAG,0,0,1,NULL }, - { "vf_autoq",&auto_quality,CONF_TYPE_INT,CONF_RANGE,0,100,NULL }, - { "vf_lavc",>kVfLAVC,CONF_TYPE_FLAG,0,0,1,NULL }, + { "vf_pp", >kVfPP, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "vf_autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL }, + { "vf_lavc", >kVfLAVC, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, - { "ao_volnorm",>kAONorm,CONF_TYPE_FLAG,0,0,1,NULL }, - { "softvol",&soft_vol,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,10,NULL }, + { "ao_driver", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "ao_volnorm", >kAONorm, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "softvol", &soft_vol, 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, 10, NULL }, #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_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_SDL - { "ao_sdl_subdriver",>kAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL }, + { "ao_sdl_subdriver", >kAOSDLDriver, 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 - { "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 }, + { "cdrom_device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "osd_level",&osd_level,CONF_TYPE_INT,CONF_RANGE,0,3,NULL }, - { "sub_auto_load",&sub_auto,CONF_TYPE_FLAG,0,0,1,NULL }, - { "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL }, + { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, + { "sub_auto_load", &sub_auto, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "sub_unicode", &sub_unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL }, #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 - { "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,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_overlap", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 0, 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 - { "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 - { "cache",>kCacheOn,CONF_TYPE_FLAG,0,0,1,NULL }, - { "cache_size",>kCacheSize,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL }, + { "cache", >kCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "cache_size", >kCacheSize, CONF_TYPE_INT, CONF_RANGE, -1, 65535, 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 }, - { "stopxscreensaver",&stop_xscreensaver,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 }, + { "stopxscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "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 }, - { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL }, + { "gui_skin", &skinName, CONF_TYPE_STRING, 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}, + { "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 }, - { "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 }, - 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 ) +#define audio_equ_row(i, j) { "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) + 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 - { NULL, NULL, 0, 0, 0, 0, NULL } + { NULL, NULL, 0, 0, 0, 0, NULL } }; -static char * gfgets( char * str, int size, FILE * f ) +static char *gfgets(char *str, int size, FILE *f) { - char * s = fgets( str,size,f ); - char c; - if ( s ) - { - c=s[ strlen( s ) - 1 ]; if ( c == '\n' || c == '\r' ) s[ strlen( s ) - 1 ]=0; - c=s[ strlen( s ) - 1 ]; if ( c == '\n' || c == '\r' ) s[ strlen( s ) - 1 ]=0; - } - return s; + char *s, c; + + s = fgets(str, size, f); + + if (s) { + c = s[strlen(s) - 1]; + + if (c == '\n' || c == '\r') + s[strlen(s) - 1] = 0; + + c = s[strlen(s) - 1]; + + if (c == '\n' || c == '\r') + s[strlen(s) - 1] = 0; + } + + return s; } -int cfg_read( void ) +int cfg_read(void) { - char * cfg = get_path( "gui.conf" ); - FILE * f; + char *cfg; + FILE *f; + + // configuration + + cfg = get_path("gui.conf"); + + mp_msg(MSGT_GPLAYER, MSGL_V, "[cfg] reading config file: %s\n", cfg); + + gui_conf = m_config_new(); + m_config_register_options(gui_conf, gui_opts); + + if (!disable_gui_conf && (m_config_parse_config_file(gui_conf, cfg) < 0)) { + mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_ConfigFileError); +// exit(1); + } + + free(cfg); -// -- read configuration - mp_msg( MSGT_GPLAYER,MSGL_V,"[cfg] reading config file: %s\n",cfg ); - gui_conf=m_config_new(); - m_config_register_options( gui_conf,gui_opts ); - if ( !disable_gui_conf && m_config_parse_config_file( gui_conf,cfg ) < 0 ) - { - mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_ConfigFileError ); -// exit( 1 ); - } - free( cfg ); + // playlist + + cfg = get_path("gui.pl"); + f = fopen(cfg, "rt"); + + if (f) { + while (!feof(f)) { + char tmp[512]; + plItem *item; -// -- read pl - cfg=get_path( "gui.pl" ); - if ( (f=fopen( cfg,"rt" )) ) - { - while ( !feof( f ) ) - { - char tmp[512]; plItem * item; - if ( gfgets( tmp,512,f ) == NULL ) continue; - item=calloc( 1,sizeof( plItem ) ); - item->path=strdup( tmp ); - gfgets( tmp,512,f ); - item->name=strdup( tmp ); - gtkSet( gtkAddPlItem,0,(void*)item ); + if (gfgets(tmp, 512, f) == NULL) + continue; + + item = calloc(1, sizeof(plItem)); + item->path = strdup(tmp); + gfgets(tmp, 512, f); + item->name = strdup(tmp); + gtkSet(gtkAddPlItem, 0, (void *)item); + } + + fclose(f); } - fclose( f ); - } - free( cfg ); + + free(cfg); + + // URL list + + cfg = get_path("gui.url"); + f = fopen(cfg, "rt"); - //-- read previously visited urls - cfg=get_path( "gui.url" ); - if ( (f=fopen( cfg,"rt" )) ) - { - while ( !feof( f ) ) - { - char tmp[512]; URLItem * item; - if ( gfgets( tmp,512,f ) == NULL ) continue; - item=calloc( 1,sizeof( URLItem ) ); - item->url=strdup( tmp ); - gtkSet( gtkAddURLItem,0,(void*)item ); + if (f) { + while (!feof(f)) { + char tmp[512]; + URLItem *item; + + if (gfgets(tmp, 512, f) == NULL) + continue; + + item = calloc(1, sizeof(URLItem)); + item->url = strdup(tmp); + gtkSet(gtkAddURLItem, 0, (void *)item); + } + + fclose(f); } - fclose( f ); - } - free( cfg ); + + free(cfg); + + // directory history + + cfg = get_path("gui.history"); + f = fopen(cfg, "rt+"); + + if (f) { + int i = 0; -// -- reade file loader history - cfg=get_path( "gui.history" ); - if ( (f=fopen( cfg,"rt+" )) ) - { - int i = 0; - while ( !feof( f ) ) - { - char tmp[512]; - if ( gfgets( tmp,512,f ) == NULL ) continue; - fsHistory[i++]=gstrdup( tmp ); + while (!feof(f)) { + char tmp[512]; + + if (gfgets(tmp, 512, f) == NULL) + continue; + + fsHistory[i++] = gstrdup(tmp); + } + + fclose(f); } - fclose( f ); - } - free( cfg ); - return 0; + free(cfg); + + return 0; } -int cfg_write( void ) +int cfg_write(void) { - char * cfg = get_path( "gui.conf" ); - FILE * f; - int i; + char *cfg; + FILE *f; + int i; + + // configuration + + cfg = get_path("gui.conf"); + f = fopen(cfg, "wt+"); + + if (f) { + for (i = 0; gui_opts[i].name; i++) { + char *v = m_option_print(&gui_opts[i], gui_opts[i].p); + + if (v == (char *)-1) { + mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_UnableToSaveOption, gui_opts[i].name); + v = NULL; + } -// -- save configuration - if ( (f=fopen( cfg,"wt+" )) ) - { - for ( i=0;gui_opts[i].name;i++ ) - { - char* v = m_option_print(&gui_opts[i],gui_opts[i].p); - if(v == (char *)-1) { - mp_msg(MSGT_GPLAYER,MSGL_WARN,MSGTR_UnableToSaveOption, gui_opts[i].name); - v = NULL; - } - if(v) { - fprintf( f,"%s = \"%s\"\n",gui_opts[i].name, v); - free(v); - } + if (v) { + fprintf(f, "%s = \"%s\"\n", gui_opts[i].name, v); + free(v); + } + } + + fclose(f); } - fclose( f ); - } - free( cfg ); + + free(cfg); + + // playlist + + cfg = get_path("gui.pl"); + f = fopen(cfg, "wt+"); + + if (f) { + plCurrent = plList; + + while (plCurrent) { + if (plCurrent->path && plCurrent->name) { + fprintf(f, "%s\n", plCurrent->path); + fprintf(f, "%s\n", plCurrent->name); + } -// -- save playlist - cfg=get_path( "gui.pl" ); - if ( (f=fopen( cfg,"wt+" )) ) - { - plCurrent=plList; - while ( plCurrent ) - { - if ( plCurrent->path && plCurrent->name ) - { - fprintf( f,"%s\n",plCurrent->path ); - fprintf( f,"%s\n",plCurrent->name ); - } - plCurrent=plCurrent->next; + plCurrent = plCurrent->next; + } + + fclose(f); } - fclose( f ); - } - free( cfg ); + + free(cfg); + + // URL list + + cfg = get_path("gui.url"); + f = fopen(cfg, "wt+"); + + if (f) { + while (URLList) { + if (URLList->url) + fprintf(f, "%s\n", URLList->url); + + URLList = URLList->next; + } -// -- save URL's - cfg=get_path( "gui.url" ); - if ( (f=fopen( cfg,"wt+" )) ) - { - while ( URLList ) - { - if ( URLList->url ) fprintf( f,"%s\n",URLList->url ); - URLList=URLList->next; + fclose(f); } - fclose( f ); - } - free( cfg ); + + free(cfg); + + // directory history + + cfg = get_path("gui.history"); + f = fopen(cfg, "wt+"); + + if (f) { + int i = 0; -// -- save file loader history - cfg=get_path( "gui.history" ); - if ( (f=fopen( cfg,"wt+" )) ) - { - int i = 0; -// while ( fsHistory[i] != NULL ) - for ( i=0;i < 5; i++) - if( fsHistory[i] ) fprintf( f,"%s\n",fsHistory[i] ); - fclose( f ); - } - free( cfg ); +// while (fsHistory[i] != NULL) + for (i = 0; i < 5; i++) + if (fsHistory[i]) + fprintf(f, "%s\n", fsHistory[i]); - return 0; + fclose(f); + } + + free(cfg); + + return 0; } diff -r cdfb3ba2967f -r 218edd8fc782 gui/cfg.h --- a/gui/cfg.h Fri Apr 15 10:58:36 2011 +0000 +++ b/gui/cfg.h Fri Apr 15 14:30:58 2011 +0000 @@ -21,49 +21,54 @@ #include "config.h" -extern int gtkEnableAudioEqualizer; +extern int gtkCacheOn; +extern int gtkCacheSize; -extern int gtkVfPP; -extern int gtkVfLAVC; +extern int gtkVfLAVC; +extern int gtkVfPP; + +#ifdef CONFIG_DXR3 +extern char *gtkDXR3Device; +#endif -extern int gtkAONorm; -extern int gtkAOFakeSurround; -extern int gtkAOExtraStereo; -extern float gtkAOExtraStereoMul; -extern char * gtkAOOSSMixer; -extern char * gtkAOOSSMixerChannel; -extern char * gtkAOOSSDevice; -extern char * gtkAOALSAMixer; -extern char * gtkAOALSAMixerChannel; -extern char * gtkAOALSADevice; -extern char * gtkAOSDLDriver; -extern char * gtkAOESDDevice; -extern char * gtkDXR3Device; +extern int gtkAutoSyncOn; +extern int gtkAutoSync; -extern int gtkCacheOn; -extern int gtkCacheSize; +extern int gtkAONorm; +extern int gtkAOSurround; +extern int gtkAOExtraStereo; +extern float gtkAOExtraStereoMul; + +#ifdef CONFIG_ALSA +extern char *gtkAOALSAMixer; +extern char *gtkAOALSAMixerChannel; +extern char *gtkAOALSADevice; +#endif -extern int gtkAutoSyncOn; -extern int gtkAutoSync; +#ifdef CONFIG_OSS_AUDIO +extern char *gtkAOOSSMixer; +extern char *gtkAOOSSMixerChannel; +extern char *gtkAOOSSDevice; +#endif -extern int gtkSubDumpMPSub; -extern int gtkSubDumpSrt; +#ifdef CONFIG_ESD +extern char *gtkAOESDDevice; +#endif -extern char * gtkEquChannel1; -extern char * gtkEquChannel2; -extern char * gtkEquChannel3; -extern char * gtkEquChannel4; -extern char * gtkEquChannel5; -extern char * gtkEquChannel6; -extern int gtkLoadFullscreen; -extern int gtkShowVideoWindow; -extern int gtkEnablePlayBar; +#ifdef CONFIG_SDL +extern char *gtkAOSDLDriver; +#endif -extern int gui_save_pos; -extern int gui_main_pos_x; -extern int gui_main_pos_y; -extern int gui_sub_pos_x; -extern int gui_sub_pos_y; +extern int gtkEnableAudioEqualizer; +extern char *gtkEquChannel1; +extern char *gtkEquChannel2; +extern char *gtkEquChannel3; +extern char *gtkEquChannel4; +extern char *gtkEquChannel5; +extern char *gtkEquChannel6; + +extern int gtkSubDumpMPSub; +extern int gtkSubDumpSrt; #ifdef CONFIG_ASS typedef struct { @@ -72,10 +77,21 @@ int top_margin; int bottom_margin; } gtkASS_t; + extern gtkASS_t gtkASS; #endif -int cfg_read( void ); -int cfg_write( void ); +extern int gtkEnablePlayBar; +extern int gtkLoadFullscreen; +extern int gtkShowVideoWindow; + +extern int gui_save_pos; +extern int gui_main_pos_x; +extern int gui_main_pos_y; +extern int gui_sub_pos_x; +extern int gui_sub_pos_y; + +int cfg_read(void); +int cfg_write(void); #endif /* MPLAYER_GUI_CFG_H */