annotate Gui/interface.c @ 6895:e0fa2a6a8843

updated - we're ready for a pre-release now
author arpi
date Sun, 04 Aug 2002 15:39:31 +0000
parents e1c5f3128b3a
children 138a7ff52a26
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
1
4845
ed5aa118e142 inttypes.h bug fix. 10l
pontscho
parents: 4818
diff changeset
2 #include <inttypes.h>
ed5aa118e142 inttypes.h bug fix. 10l
pontscho
parents: 4818
diff changeset
3 #include <stdlib.h>
ed5aa118e142 inttypes.h bug fix. 10l
pontscho
parents: 4818
diff changeset
4 #include <stdio.h>
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
5 #include <string.h>
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
6
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
7 #include "ws.h"
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
8 #include "mplayer/play.h"
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
9 #include "interface.h"
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
10 #include "skin/skin.h"
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
11 #include "mplayer/gtk/eq.h"
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
12
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
13 #include "../mplayer.h"
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
14 #include "mplayer/widgets.h"
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
15 #include "mplayer/mplayer.h"
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
16 #include "app.h"
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
17 #include "cfg.h"
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
18 #include "../help_mp.h"
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
19 #include "../subreader.h"
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
20 #include "../libvo/x11_common.h"
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
21 #include "../libvo/video_out.h"
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
22 #include "../libvo/font_load.h"
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
23 #include "../input/input.h"
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
24 #include "../libao2/audio_out.h"
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
25 #include "../mixer.h"
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
26 #include "../libao2/audio_plugin.h"
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
27 #include "../libao2/eq.h"
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
28
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
29 #include <inttypes.h>
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
30 #include <sys/types.h>
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
31
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
32 #include "../libmpdemux/stream.h"
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
33 #include "../libmpdemux/demuxer.h"
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
34
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
35 guiInterface_t guiIntfStruct;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
36
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
37 char * gstrcat( char ** dest,char * src )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
38 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
39 char * tmp = NULL;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
40
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
41 if ( !src ) return NULL;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
42
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
43 if ( *dest )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
44 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
45 tmp=malloc( strlen( *dest ) + strlen( src ) + 1 );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
46 strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
47 }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
48 else
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
49 { tmp=malloc( strlen( src ) + 1 ); strcpy( tmp,src ); }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
50 *dest=tmp;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
51 return tmp;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
52 }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
53
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
54 int gstrcmp( char * a,char * b )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
55 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
56 if ( !a && !b ) return 0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
57 if ( !a || !b ) return -1;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
58 return strcmp( a,b );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
59 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
60
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
61 char * gstrdup( char * str )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
62 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
63 if ( !str ) return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
64 return strdup( str );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
65 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
66
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
67 void gfree( void ** p )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
68 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
69 if ( *p == NULL ) return;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
70 free( *p ); *p=NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
71 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
72
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
73 void gset( char ** str,char * what )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
74 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
75 if ( *str ) { if ( !strstr( *str,what ) ) gstrcat( str,"," ); gstrcat( str,what ); }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
76 else gstrcat( str,what );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
77 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
78
6218
8cfddba867b4 fix text render chrash ...
pontscho
parents: 5997
diff changeset
79 void guiInit( void )
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
80 {
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
81 memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) );
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
82 memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
83 gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
84 gtkAOOSSDevice=strdup( PATH_DEV_DSP );
6891
e1c5f3128b3a gui.conf parsing moved to after gtkInit() - should fix i18n problems
arpi
parents: 6857
diff changeset
85 // cfg_read(); // !!! moved to Gui/mplayer/mplayer.c::mplInit() after gtkInit()
6218
8cfddba867b4 fix text render chrash ...
pontscho
parents: 5997
diff changeset
86 appInit( (void*)mDisplay );
6857
pontscho
parents: 6842
diff changeset
87 if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name );
6797
06d29dbdf20d upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents: 6794
diff changeset
88 #if defined( USE_OSD ) || defined( USE_SUB )
06d29dbdf20d upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents: 6794
diff changeset
89 guiLoadFont();
06d29dbdf20d upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents: 6794
diff changeset
90 #endif
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
91 }
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
92
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
93 void guiDone( void )
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
94 {
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
95 mp_msg( MSGT_GPLAYER,MSGL_V,"[mplayer] exit.\n" );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
96 cfg_write();
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
97 gtkDone();
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
98 wsXDone();
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
99 }
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
100
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
101 int guiCMDArray[] =
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
102 {
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
103 evLoad,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
104 evLoadSubtitle,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
105 evAbout,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
106 evPlay,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
107 evStop,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
108 evPlayList,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
109 evPreferences,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
110 evFullScreen,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
111 evSkinBrowser
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
112 };
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
113
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
114 typedef struct
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
115 {
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
116 demux_stream_t *ds;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
117 unsigned int format;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
118 struct codecs_st *codec;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
119 int inited;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
120 // output format:
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
121 float timer;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
122 float fps;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
123 float frametime;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
124 int i_bps;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
125 int disp_w,disp_h;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
126 } tmp_sh_video_t;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
127
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
128 extern ao_functions_t * audio_out;
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
129 extern vo_functions_t * video_out;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
130 extern int flip;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
131 extern int frame_dropping;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
132 extern int sub_pos;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
133 extern int sub_unicode;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
134 extern int stream_dump_type;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
135 extern char ** vo_plugin_args;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
136 extern int auto_quality;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
137
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
138 #if defined( USE_OSD ) || defined( USE_SUB )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
139 void guiLoadFont( void )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
140 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
141 font_factor=gtkSubFFactor;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
142 if ( vo_font )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
143 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
144 int i;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
145 if ( vo_font->name ) free( vo_font->name );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
146 if ( vo_font->fpath ) free( vo_font->fpath );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
147 for ( i=0;i<16;i++ )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
148 if ( vo_font->pic_a[i] )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
149 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
150 if ( vo_font->pic_a[i]->bmp ) free( vo_font->pic_a[i]->bmp );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
151 if ( vo_font->pic_a[i]->pal ) free( vo_font->pic_a[i]->pal );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
152 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
153 for ( i=0;i<16;i++ )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
154 if ( vo_font->pic_b[i] )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
155 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
156 if ( vo_font->pic_b[i]->bmp ) free( vo_font->pic_b[i]->bmp );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
157 if ( vo_font->pic_b[i]->pal ) free( vo_font->pic_b[i]->pal );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
158 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
159 free( vo_font ); vo_font=NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
160 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
161 if ( guiIntfStruct.Fontname )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
162 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
163 vo_font=read_font_desc( guiIntfStruct.Fontname,font_factor,0 );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
164 if ( !vo_font ) mp_msg( MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
165 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
166 else
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
167 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
168 guiIntfStruct.Fontname=gstrdup( get_path( "font/font.desc" ) );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
169 vo_font=read_font_desc( guiIntfStruct.Fontname,font_factor,0 );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
170 if ( !vo_font )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
171 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
172 gfree( (void **)&guiIntfStruct.Fontname ); guiIntfStruct.Fontname=gstrdup( DATADIR"/font/font.desc" );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
173 vo_font=read_font_desc( guiIntfStruct.Fontname,font_factor,0 );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
174 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
175 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
176 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
177 #endif
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
178
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
179 void guiGetEvent( int type,char * arg )
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
180 {
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
181 stream_t * stream = (stream_t *) arg;
5672
1f8b34f1e7c0 ifdef reading dvd args, without it non-dvd compilation fails.
eyck
parents: 5665
diff changeset
182 #ifdef USE_DVDREAD
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
183 dvd_priv_t * dvdp = (dvd_priv_t *) arg;
5672
1f8b34f1e7c0 ifdef reading dvd args, without it non-dvd compilation fails.
eyck
parents: 5665
diff changeset
184 #endif
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
185
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
186 switch ( type )
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
187 {
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
188 case guiXEvent:
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
189 wsEvents( wsDisplay,(XEvent *)arg,NULL );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
190 gtkEventHandling();
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
191 break;
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
192 case guiCEvent:
4963
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
193 switch ( (int)arg )
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
194 {
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
195 case guiSetPlay: guiIntfStruct.Playing=1; mplState(); break;
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
196 case guiSetStop: guiIntfStruct.Playing=0; mplState(); break;
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
197 case guiSetPause: guiIntfStruct.Playing=2; mplState(); break;
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
198 }
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
199 break;
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
200 case guiSetState:
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
201 mplState();
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
202 break;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
203 case guiSetFileName:
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
204 if ( arg ) guiSetFilename( guiIntfStruct.Filename,arg );
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
205 break;
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
206 case guiSetAudioOnly:
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
207 guiIntfStruct.AudioOnly=(int)arg;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
208 if ( (int)arg ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
209 else wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
210 break;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
211 case guiReDrawSubWindow:
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
212 wsPostRedisplay( &appMPlayer.subWindow );
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
213 break;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
214 case guiSetShVideo:
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
215 {
5986
d34622ebaf45 window resize bug fixed
pontscho
parents: 5956
diff changeset
216 if ( !appMPlayer.subWindow.isFullScreen )
d34622ebaf45 window resize bug fixed
pontscho
parents: 5956
diff changeset
217 {
d34622ebaf45 window resize bug fixed
pontscho
parents: 5956
diff changeset
218 wsResizeWindow( &appMPlayer.subWindow,vo_dwidth,vo_dheight );
d34622ebaf45 window resize bug fixed
pontscho
parents: 5956
diff changeset
219 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
d34622ebaf45 window resize bug fixed
pontscho
parents: 5956
diff changeset
220 }
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
221 guiIntfStruct.MovieWidth=vo_dwidth;
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5986
diff changeset
222 guiIntfStruct.MovieHeight=vo_dheight;
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
223 }
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
224 break;
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
225 #ifdef USE_DVDREAD
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
226 case guiSetDVD:
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
227 guiIntfStruct.DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
228 guiIntfStruct.DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
229 guiIntfStruct.DVD.angles=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
230 guiIntfStruct.DVD.nr_of_audio_channels=dvdp->nr_of_channels;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
231 memcpy( guiIntfStruct.DVD.audio_streams,dvdp->audio_streams,sizeof( dvdp->audio_streams ) );
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
232 guiIntfStruct.DVD.nr_of_subtitles=dvdp->nr_of_subtitles;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
233 memcpy( guiIntfStruct.DVD.subtitles,dvdp->subtitles,sizeof( dvdp->subtitles ) );
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
234 guiIntfStruct.DVD.current_title=dvd_title + 1;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
235 guiIntfStruct.DVD.current_chapter=dvd_chapter + 1;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
236 guiIntfStruct.DVD.current_angle=dvd_angle + 1;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
237 guiIntfStruct.Track=dvd_title + 1;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
238 break;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
239 #endif
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
240 case guiSetStream:
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
241 guiIntfStruct.StreamType=stream->type;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
242 switch( stream->type )
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
243 {
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
244 case STREAMTYPE_DVD:
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
245 guiGetEvent( guiSetDVD,(char *)stream->priv );
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
246 break;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
247 #ifdef HAVE_VCD
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
248 case STREAMTYPE_VCD:
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
249 {
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
250 int i;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
251 for ( i=1;i < 100;i++ )
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
252 if ( vcd_seek_to_track( stream->fd,i ) < 0 ) break;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
253 vcd_seek_to_track( stream->fd,vcd_track );
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
254 guiIntfStruct.VCDTracks=--i;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
255 mp_msg( MSGT_GPLAYER,MSGL_INFO,"[interface] vcd tracks: %d\n",guiIntfStruct.VCDTracks );
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
256 guiIntfStruct.Track=vcd_track;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
257 break;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
258 }
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
259 #endif
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
260 }
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
261 break;
5120
ce054c1eabdc workaround to compile without new-input support
alex
parents: 4965
diff changeset
262 #ifdef HAVE_NEW_INPUT
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
263 case guiIEvent:
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
264 printf( "cmd: %d\n",(int)arg );
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
265 switch( (int)arg )
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
266 {
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
267 case MP_CMD_QUIT:
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
268 mplEventHandling( evExit,0 );
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
269 break;
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
270 case MP_CMD_VO_FULLSCREEN:
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
271 mplEventHandling( evFullScreen,0 );
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
272 break;
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
273 default:
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
274 mplEventHandling( guiCMDArray[ (int)arg - MP_CMD_GUI_EVENTS - 1 ],0 );
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
275 }
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
276 break;
5120
ce054c1eabdc workaround to compile without new-input support
alex
parents: 4965
diff changeset
277 #endif
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
278 case guiReDraw:
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
279 mplEventHandling( evRedraw,0 );
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
280 break;
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
281 case guiSetVolume:
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
282 // -- audio
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
283 if ( audio_out )
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
284 {
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
285 float l,r;
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
286 mixer_getvolume( &l,&r );
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
287 guiIntfStruct.Volume=(r>l?r:l);
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
288 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
289 else guiIntfStruct.Balance=50.0f;
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
290 btnModify( evSetVolume,guiIntfStruct.Volume );
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
291 btnModify( evSetBalance,guiIntfStruct.Balance );
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
292 }
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
293
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
294 if ( gtkAONoSound ) { if ( !muted ) mixer_mute(); }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
295 else if ( muted ) mixer_mute();
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
296
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
297 if ( gtkEnableAudioEqualizer )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
298 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
299 equalizer_t eq;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
300 int i,j;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
301 for ( i=0;i<6;i++ )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
302 for ( j=0;j<10;j++ )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
303 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
304 eq.channel=i; eq.band=j; eq.gain=gtkEquChannels[i][j];
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
305 gtkSet( gtkSetEqualizer,0,&eq );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
306 }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
307 }
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
308 // -- subtitle
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
309 gtkSubUnicode=sub_unicode;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
310 gtkSubDelay=sub_delay;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
311 gtkSubFPS=sub_fps;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
312 gtkSubPos=sub_pos;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
313 #ifdef USE_OSD
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
314 gtkSubFFactor=font_factor;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
315 #endif
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
316 break;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
317 case guiSetDefaults:
6857
pontscho
parents: 6842
diff changeset
318 if ( filename && !guiIntfStruct.Filename )
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
319 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
320 gtkSet( gtkDelPl,0,NULL ); guiIntfStruct.StreamType=STREAMTYPE_FILE;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
321 guiSetFilename( guiIntfStruct.Filename,filename );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
322 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
323
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
324 guiIntfStruct.DiskChanged=0;
6842
e330b1b0b835 upsz :)
pontscho
parents: 6840
diff changeset
325 // guiIntfStruct.FilenameChanged=0;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
326
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
327 // --- video opts
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
328 if ( !gtkVODriver )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
329 {
6797
06d29dbdf20d upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents: 6794
diff changeset
330 int i = 0;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
331 while ( video_out_drivers[i++] )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
332 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
333 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
334 const vo_info_t *info = video_out_drivers[i - 1]->get_info();
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
335 { gtkVODriver=gstrdup( (char *)info->short_name ); break; }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
336 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
337 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
338
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
339 if ( gtkVODriver ) { if ( video_driver ) free( video_driver ); video_driver=strdup( gtkVODriver ); }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
340 else { gtkMessageBox( GTK_MB_FATAL,MSGTR_IDFGCVD ); exit_player( "gui init" ); }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
341
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
342 if ( gtkVPP )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
343 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
344 if ( vo_plugin_args )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
345 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
346 int i = 0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
347 while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],"pp" ) ) { i=-1; break; }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
348 if ( i != -1 )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
349 { vo_plugin_args=realloc( vo_plugin_args,( i + 2 ) * sizeof( char * ) ); vo_plugin_args[i]=strdup( "pp" ); vo_plugin_args[i+1]=NULL; }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
350 } else { vo_plugin_args=malloc( 2 * sizeof( char * ) ); vo_plugin_args[0]=strdup( "pp" ); vo_plugin_args[1]=NULL; }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
351 auto_quality=gtkVAutoq;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
352 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
353 else
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
354 if ( vo_plugin_args )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
355 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
356 int n = 0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
357 while ( vo_plugin_args[n++] ); n--;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
358 if ( n > -1 )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
359 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
360 int i = 0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
361 while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],"pp" ) ) break; i--;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
362 if ( n == i )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
363 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
364 if ( n == 1 ) { free( vo_plugin_args[0] ); free( vo_plugin_args ); vo_plugin_args=NULL; }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
365 else memcpy( &vo_plugin_args[i],&vo_plugin_args[i+1],( n - i ) * sizeof( char * ) );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
366 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
367 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
368 auto_quality=0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
369 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
370 vo_doublebuffering=gtkVODoubleBuffer;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
371 vo_directrendering=gtkVODirectRendering;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
372 frame_dropping=gtkVFrameDrop;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
373 if ( gtkVHardFrameDrop ) frame_dropping=gtkVHardFrameDrop;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
374 flip=gtkVFlip;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
375 force_ni=gtkVNIAVI;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
376 video_family=gtkVVFM;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
377
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
378 // --- audio opts
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
379 audio_delay=gtkAODelay;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
380 if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; }
6840
ed02bae611d5 - some cosmetic change in preferences
pontscho
parents: 6797
diff changeset
381 if ( gtkAONorm ) gset( &ao_plugin_cfg.plugin_list,"volnorm" );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
382 if ( gtkEnableAudioEqualizer ) gset( &ao_plugin_cfg.plugin_list,"eq" );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
383 if ( gtkAOExtraStereo )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
384 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
385 gset( &ao_plugin_cfg.plugin_list,"extrastereo" );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
386 ao_plugin_cfg.pl_extrastereo_mul=gtkAOExtraStereoMul;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
387 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
388 mixer_device=gtkAOOSSMixer;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
389 if ( audio_driver ) free( audio_driver );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
390 if ( !gstrcmp( gtkAODriver,"oss" ) && gtkAOOSSDevice )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
391 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
392 char * tmp = calloc( 1,strlen( gtkAODriver ) + strlen( gtkAOOSSDevice ) + 2 );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
393 sprintf( tmp,"%s:%s",gtkAODriver,gtkAOOSSDevice );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
394 audio_driver=tmp;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
395 } else audio_driver=gstrdup( gtkAODriver );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
396
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
397 // -- subtitle
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
398 #ifdef USE_SUB
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
399 sub_auto=0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
400 if ( gtkSubAuto && guiIntfStruct.StreamType == STREAMTYPE_FILE && !guiIntfStruct.Subtitlename )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
401 guiSetFilename( guiIntfStruct.Subtitlename,( guiIntfStruct.Filename ? sub_filename( get_path("sub/"),guiIntfStruct.Filename ): "default.sub" ) );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
402 sub_name=guiIntfStruct.Subtitlename;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
403 sub_unicode=gtkSubUnicode;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
404 sub_delay=gtkSubDelay;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
405 sub_fps=gtkSubFPS;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
406 sub_pos=gtkSubPos;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
407 stream_dump_type=0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
408 if ( gtkSubDumpMPSub ) stream_dump_type=4;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
409 if ( gtkSubDumpSrt ) stream_dump_type=6;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
410 gtkSubDumpMPSub=gtkSubDumpSrt=0;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
411 #endif
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
412 #if defined( USE_OSD ) || defined( USE_SUB )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
413 guiLoadFont();
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
414 #endif
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
415
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
416 // --- misc
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
417 if ( guiIntfStruct.AudioFile ) audio_stream=guiIntfStruct.AudioFile;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
418 else if ( guiIntfStruct.FilenameChanged ) audio_stream=NULL;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
419 index_mode=gtkVIndex;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
420
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
421 break;
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
422 }
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
423 }
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
424
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
425 extern unsigned int GetTimerMS( void );
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
426 extern int mplTimer;
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
427
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
428 void guiEventHandling( void )
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
429 {
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
430 if ( !guiIntfStruct.Playing || guiIntfStruct.AudioOnly ) wsHandleEvents();
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
431 gtkEventHandling();
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
432 mplTimer=GetTimerMS() / 20;
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
433 }
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
434
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
435 // ---
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
436
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
437 float gtkEquChannels[6][10];
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
438
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
439 plItem * plCurrent = NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
440 plItem * plList = NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
441 plItem * plLastPlayed = NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
442
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
443 #if defined( MP_DEBUG ) && 0
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
444 void list( void )
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
445 {
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
446 plItem * next = plList;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
447 printf( "--- list ---\n" );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
448 while( next || next->next )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
449 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
450 printf( "item: %s/%s\n",next->path,next->name );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
451 if ( next->next ) next=next->next; else break;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
452 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
453 printf( "--- end of list ---\n" );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
454 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
455 #else
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
456 #define list();
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
457 #endif
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
458
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
459 void * gtkSet( int cmd,float fparam, void * vparam )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
460 {
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
461 mp_cmd_t * mp_cmd;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
462 equalizer_t * eq = (equalizer_t *)vparam;
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
463 plItem * item = (plItem *)vparam;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
464
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
465 switch ( cmd )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
466 {
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
467 // --- handle playlist
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
468 case gtkAddPlItem: // add item to playlist
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
469 if ( plList )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
470 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
471 plItem * next = plList;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
472 while ( next->next ) { /*printf( "%s\n",next->name );*/ next=next->next; }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
473 next->next=item; item->prev=next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
474 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
475 else { item->prev=item->next=NULL; plCurrent=plList=item; }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
476 list();
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
477 return NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
478 case gtkGetNextPlItem: // get current item from playlist
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
479 if ( plCurrent )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
480 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
481 plCurrent=plCurrent->next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
482 if ( !plCurrent && plList )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
483 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
484 plItem * next = plList;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
485 while ( next->next ) { if ( !next->next ) break; next=next->next; }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
486 plCurrent=next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
487 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
488 return plCurrent;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
489 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
490 return NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
491 case gtkGetPrevPlItem:
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
492 if ( plCurrent )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
493 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
494 plCurrent=plCurrent->prev;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
495 if ( !plCurrent && plList ) plCurrent=plList;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
496 return plCurrent;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
497 }
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
498 return NULL;
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
499 case gtkGetCurrPlItem: // get current item
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
500 return plCurrent;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
501 case gtkDelPl: // delete list
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
502 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
503 plItem * curr = plList;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
504 plItem * next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
505 if ( !plList ) return NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
506 if ( !curr->next )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
507 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
508 if ( curr->path ) free( curr->path );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
509 if ( curr->name ) free( curr->name );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
510 free( curr );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
511 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
512 else
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
513 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
514 while ( curr->next )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
515 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
516 next=curr->next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
517 if ( curr->path ) free( curr->path );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
518 if ( curr->name ) free( curr->name );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
519 free( curr );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
520 curr=next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
521 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
522 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
523 plList=NULL; plCurrent=NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
524 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
525 return NULL;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
526 // --- subtitle
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
527 case gtkSetSubAuto:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
528 gtkSubAuto=(int)fparam;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
529 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
530 case gtkSetSubDelay:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
531 // mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
532 // mp_cmd->id=MP_CMD_SUB_DELAY; mp_cmd->name=strdup( "sub_delay" );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
533 // mp_cmd->args[0].v.f=fparam; mp_cmd->args[1].v.i=1;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
534 // mp_input_queue_cmd( mp_cmd );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
535 gtkSubDelay=sub_delay=fparam;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
536 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
537 case gtkSetSubFPS:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
538 gtkSubFPS=sub_fps=(int)fparam;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
539 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
540 case gtkSetSubPos:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
541 gtkSubPos=sub_pos=(int)fparam;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
542 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
543 #if defined( USE_OSD ) || defined( USE_SUB )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
544 case gtkSetFontFactor:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
545 gtkSubFFactor=fparam;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
546 guiLoadFont();
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
547 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
548 #endif
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
549 // --- misc
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
550 case gtkClearStruct:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
551 if ( (unsigned int)fparam & guiFilenames )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
552 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
553 gfree( (void **)&guiIntfStruct.Filename );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
554 gfree( (void **)&guiIntfStruct.Subtitlename );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
555 gfree( (void **)&guiIntfStruct.AudioFile );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
556 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
557 #ifdef USE_DVDREAD
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
558 if ( (unsigned int)fparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
559 #endif
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
560 #ifdef HAVE_VCD
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
561 if ( (unsigned int)fparam & guiVCD ) guiIntfStruct.VCDTracks=0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
562 #endif
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
563 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
564 case gtkSetExtraStereo:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
565 gtkAOExtraStereoMul=fparam;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
566 audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(int)&gtkAOExtraStereoMul );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
567 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
568 case gtkSetAudioDelay:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
569 audio_delay=gtkAODelay=fparam;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
570 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
571 case gtkSetPanscan:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
572 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
573 mp_cmd->id=MP_CMD_PANSCAN; mp_cmd->name=strdup( "panscan" );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
574 mp_cmd->args[0].v.f=fparam; mp_cmd->args[1].v.i=1;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
575 mp_input_queue_cmd( mp_cmd );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
576 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
577 case gtkSetAutoq:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
578 auto_quality=gtkVAutoq=(int)fparam;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
579 return NULL;
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
580 // --- set equalizers
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
581 case gtkSetContrast:
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
582 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
583 mp_cmd->id=MP_CMD_CONTRAST; mp_cmd->name=strdup( "contrast" );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
584 break;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
585 case gtkSetBrightness:
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
586 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
587 mp_cmd->id=MP_CMD_BRIGHTNESS; mp_cmd->name=strdup( "brightness" );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
588 break;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
589 case gtkSetHue:
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
590 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
591 mp_cmd->id=MP_CMD_HUE; mp_cmd->name=strdup( "hue" );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
592 break;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
593 case gtkSetSaturation:
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
594 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
595 mp_cmd->id=MP_CMD_SATURATION; mp_cmd->name=strdup( "saturation" );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
596 break;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
597 case gtkSetEqualizer:
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
598 if ( eq )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
599 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
600 gtkEquChannels[eq->channel][eq->band]=eq->gain;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
601 audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)eq );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
602 }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
603 else
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
604 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
605 int i,j; equalizer_t tmp; tmp.gain=0.0f;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
606 memset( gtkEquChannels,0,sizeof( gtkEquChannels ) );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
607 for ( i=0;i<6;i++ )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
608 for ( j=0;j<10;j++ )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
609 { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)&tmp ); }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
610 }
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
611 return NULL;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
612 default: return NULL;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
613 }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
614 mp_cmd->args[0].v.i=(int)fparam;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
615 mp_cmd->args[1].v.i=1;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
616 mp_input_queue_cmd( mp_cmd );
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
617 return NULL;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
618 }