Mercurial > mplayer.hg
annotate Gui/interface.c @ 7149:aa9debe16559
10l bug, found by Nexus
author | arpi |
---|---|
date | Thu, 29 Aug 2002 21:37:45 +0000 |
parents | dd1e21e775b6 |
children | b212f74e14ec |
rev | line source |
---|---|
6280 | 1 |
4845 | 2 #include <inttypes.h> |
3 #include <stdlib.h> | |
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 | 6 |
7 #include "ws.h" | |
8 #include "mplayer/play.h" | |
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 | 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 | 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 | 17 #include "cfg.h" |
18 #include "../help_mp.h" | |
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 | 21 #include "../libvo/video_out.h" |
6794 | 22 #include "../libvo/font_load.h" |
4858 | 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 | 25 #include "../mixer.h" |
26 #include "../libao2/audio_plugin.h" | |
27 #include "../libao2/eq.h" | |
5789 | 28 |
6280 | 29 #include <inttypes.h> |
30 #include <sys/types.h> | |
31 | |
6996 | 32 #ifdef USE_ICONV |
7128 | 33 #include <iconv.h> |
6996 | 34 #endif |
35 | |
5665 | 36 #include "../libmpdemux/stream.h" |
5789 | 37 #include "../libmpdemux/demuxer.h" |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
38 |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
39 guiInterface_t guiIntfStruct; |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
40 |
6627 | 41 char * gstrcat( char ** dest,char * src ) |
42 { | |
43 char * tmp = NULL; | |
44 | |
45 if ( !src ) return NULL; | |
46 | |
47 if ( *dest ) | |
48 { | |
49 tmp=malloc( strlen( *dest ) + strlen( src ) + 1 ); | |
50 strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest ); | |
51 } | |
52 else | |
53 { tmp=malloc( strlen( src ) + 1 ); strcpy( tmp,src ); } | |
54 *dest=tmp; | |
55 return tmp; | |
56 } | |
57 | |
6794 | 58 int gstrcmp( char * a,char * b ) |
59 { | |
60 if ( !a && !b ) return 0; | |
61 if ( !a || !b ) return -1; | |
62 return strcmp( a,b ); | |
63 } | |
64 | |
7019 | 65 int gstrncmp( char * a,char * b,int size ) |
66 { | |
67 if ( !a && !b ) return 0; | |
68 if ( !a || !b ) return -1; | |
69 return strncmp( a,b,size ); | |
70 } | |
71 | |
6794 | 72 char * gstrdup( char * str ) |
73 { | |
74 if ( !str ) return NULL; | |
75 return strdup( str ); | |
76 } | |
77 | |
78 void gfree( void ** p ) | |
79 { | |
80 if ( *p == NULL ) return; | |
81 free( *p ); *p=NULL; | |
82 } | |
83 | |
84 void gset( char ** str,char * what ) | |
85 { | |
86 if ( *str ) { if ( !strstr( *str,what ) ) gstrcat( str,"," ); gstrcat( str,what ); } | |
87 else gstrcat( str,what ); | |
88 } | |
89 | |
6996 | 90 #ifdef USE_ICONV |
91 char * gconvert_uri_to_filename( char * str ) | |
92 { | |
93 iconv_t d; | |
94 char * out = strdup( str ); | |
95 char * tmp = NULL; | |
96 char * ize; | |
97 size_t inb,outb; | |
98 char * charset = "ISO8859-1"; | |
99 char * cs; | |
100 | |
101 if ( !strchr( str,'%' ) ) return str; | |
102 | |
103 { | |
104 char * t = calloc( 1,strlen( out ) ); | |
105 int i,c = 0; | |
106 for ( i=0;i < (int)strlen( out );i++ ) | |
107 if ( out[i] != '%' ) t[c++]=out[i]; | |
108 else | |
109 { | |
110 char tmp[4] = "0xXX"; | |
111 // if ( out[++i] == '%' ) { t[c++]='%'; continue; }; | |
112 tmp[2]=out[++i]; tmp[3]=out[++i]; | |
113 t[c++]=(char)strtol( tmp,(char **)NULL,0 ); | |
114 } | |
115 free( out ); | |
116 out=t; | |
117 } | |
118 | |
119 if ( (cs=getenv( "CHARSET" )) && *cs ) charset=cs; | |
120 | |
121 inb=outb=strlen( out ); | |
122 tmp=calloc( 1,outb + 1 ); | |
123 ize=tmp; | |
124 d=iconv_open( charset,"UTF-8" ); | |
125 if ( (iconv_t)(-1) == d ) return str; | |
126 iconv( d,&out,&inb,&tmp,&outb ); | |
127 iconv_close( d ); | |
128 free( out ); | |
129 return ize; | |
130 } | |
131 #endif | |
132 | |
6218 | 133 void guiInit( void ) |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
134 { |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
135 memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) ); |
6898 | 136 guiIntfStruct.Balance=50.0f; |
137 guiIntfStruct.StreamType=-1; | |
138 | |
6627 | 139 memset( >kEquChannels,0,sizeof( gtkEquChannels ) ); |
6794 | 140 gtkAOOSSMixer=strdup( PATH_DEV_MIXER ); |
141 gtkAOOSSDevice=strdup( PATH_DEV_DSP ); | |
6898 | 142 |
143 gtkInit(); | |
6912 | 144 wsXInit( (void *)mDisplay ); |
145 | |
7019 | 146 // cfg_read(); |
6218 | 147 appInit( (void*)mDisplay ); |
6898 | 148 |
7009 | 149 if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE ); |
6973 | 150 if ( sub_name ) guiSetFilename( guiIntfStruct.Subtitlename,sub_name ); |
6797
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
151 #if defined( USE_OSD ) || defined( USE_SUB ) |
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
152 guiLoadFont(); |
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
153 #endif |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
154 } |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
155 |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
156 void guiDone( void ) |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
157 { |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
158 mp_msg( MSGT_GPLAYER,MSGL_V,"[mplayer] exit.\n" ); |
6794 | 159 cfg_write(); |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
160 gtkDone(); |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
161 wsXDone(); |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
162 } |
4798 | 163 |
4858 | 164 int guiCMDArray[] = |
165 { | |
166 evLoad, | |
167 evLoadSubtitle, | |
168 evAbout, | |
169 evPlay, | |
170 evStop, | |
171 evPlayList, | |
172 evPreferences, | |
173 evFullScreen, | |
174 evSkinBrowser | |
175 }; | |
176 | |
5789 | 177 typedef struct |
178 { | |
179 demux_stream_t *ds; | |
180 unsigned int format; | |
181 struct codecs_st *codec; | |
182 int inited; | |
183 // output format: | |
184 float timer; | |
185 float fps; | |
186 float frametime; | |
187 int i_bps; | |
188 int disp_w,disp_h; | |
189 } tmp_sh_video_t; | |
190 | |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
191 extern ao_functions_t * audio_out; |
6755 | 192 extern vo_functions_t * video_out; |
6794 | 193 extern int frame_dropping; |
194 extern int stream_dump_type; | |
195 extern char ** vo_plugin_args; | |
196 | |
197 #if defined( USE_OSD ) || defined( USE_SUB ) | |
198 void guiLoadFont( void ) | |
199 { | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
200 #ifdef HAVE_FREETYPE |
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
201 load_font(vo_image_width, vo_image_height); |
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
202 #else |
6794 | 203 if ( vo_font ) |
204 { | |
205 int i; | |
206 if ( vo_font->name ) free( vo_font->name ); | |
207 if ( vo_font->fpath ) free( vo_font->fpath ); | |
208 for ( i=0;i<16;i++ ) | |
209 if ( vo_font->pic_a[i] ) | |
210 { | |
211 if ( vo_font->pic_a[i]->bmp ) free( vo_font->pic_a[i]->bmp ); | |
212 if ( vo_font->pic_a[i]->pal ) free( vo_font->pic_a[i]->pal ); | |
213 } | |
214 for ( i=0;i<16;i++ ) | |
215 if ( vo_font->pic_b[i] ) | |
216 { | |
217 if ( vo_font->pic_b[i]->bmp ) free( vo_font->pic_b[i]->bmp ); | |
218 if ( vo_font->pic_b[i]->pal ) free( vo_font->pic_b[i]->pal ); | |
219 } | |
220 free( vo_font ); vo_font=NULL; | |
221 } | |
7019 | 222 if ( font_name ) |
6794 | 223 { |
7019 | 224 vo_font=read_font_desc( font_name,font_factor,0 ); |
6794 | 225 if ( !vo_font ) mp_msg( MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name ); |
226 } | |
227 else | |
228 { | |
7019 | 229 font_name=gstrdup( get_path( "font/font.desc" ) ); |
230 vo_font=read_font_desc( font_name,font_factor,0 ); | |
6794 | 231 if ( !vo_font ) |
232 { | |
7019 | 233 gfree( (void **)&font_name ); font_name=gstrdup( DATADIR"/font/font.desc" ); |
234 vo_font=read_font_desc( font_name,font_factor,0 ); | |
6794 | 235 } |
236 } | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
237 #endif |
6794 | 238 } |
239 #endif | |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
240 |
7009 | 241 static void add_vop( char * str ) |
242 { | |
243 mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] add video filter: %s\n",str ); | |
244 if ( vo_plugin_args ) | |
245 { | |
246 int i = 0; | |
247 while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],str ) ) { i=-1; break; } | |
248 if ( i != -1 ) | |
249 { vo_plugin_args=realloc( vo_plugin_args,( i + 2 ) * sizeof( char * ) ); vo_plugin_args[i]=strdup( str ); vo_plugin_args[i+1]=NULL; } | |
250 } else { vo_plugin_args=malloc( 2 * sizeof( char * ) ); vo_plugin_args[0]=strdup( str ); vo_plugin_args[1]=NULL; } | |
251 } | |
252 | |
253 static void remove_vop( char * str ) | |
254 { | |
255 int n = 0; | |
256 | |
257 if ( !vo_plugin_args ) return; | |
258 | |
259 mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] remove video filter: %s\n",str ); | |
260 | |
261 while ( vo_plugin_args[n++] ); n--; | |
262 if ( n > -1 ) | |
263 { | |
264 int i = 0,m = -1; | |
265 while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],str ) ) { m=i - 1; break; } | |
266 i--; | |
267 if ( m > -1 ) | |
268 { | |
269 if ( n == 1 ) { free( vo_plugin_args[0] ); free( vo_plugin_args ); vo_plugin_args=NULL; } | |
270 else memcpy( &vo_plugin_args[i],&vo_plugin_args[i + 1],( n - i ) * sizeof( char * ) ); | |
271 } | |
272 } | |
273 } | |
274 | |
275 int guiGetEvent( int type,char * arg ) | |
4798 | 276 { |
6280 | 277 stream_t * stream = (stream_t *) arg; |
5672
1f8b34f1e7c0
ifdef reading dvd args, without it non-dvd compilation fails.
eyck
parents:
5665
diff
changeset
|
278 #ifdef USE_DVDREAD |
5665 | 279 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
|
280 #endif |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
281 |
4798 | 282 switch ( type ) |
283 { | |
284 case guiXEvent: | |
285 wsEvents( wsDisplay,(XEvent *)arg,NULL ); | |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
286 gtkEventHandling(); |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
287 break; |
4798 | 288 case guiCEvent: |
4963 | 289 switch ( (int)arg ) |
290 { | |
291 case guiSetPlay: guiIntfStruct.Playing=1; mplState(); break; | |
292 case guiSetStop: guiIntfStruct.Playing=0; mplState(); break; | |
293 case guiSetPause: guiIntfStruct.Playing=2; mplState(); break; | |
294 } | |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
295 break; |
5665 | 296 case guiSetState: |
297 mplState(); | |
298 break; | |
299 case guiSetFileName: | |
300 if ( arg ) guiSetFilename( guiIntfStruct.Filename,arg ); | |
301 break; | |
5789 | 302 case guiSetAudioOnly: |
303 guiIntfStruct.AudioOnly=(int)arg; | |
7009 | 304 if ( (int)arg ) { guiIntfStruct.NoWindow=True; wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); } |
5789 | 305 else wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); |
306 break; | |
307 case guiReDrawSubWindow: | |
308 wsPostRedisplay( &appMPlayer.subWindow ); | |
309 break; | |
310 case guiSetShVideo: | |
311 { | |
5986 | 312 if ( !appMPlayer.subWindow.isFullScreen ) |
313 { | |
314 wsResizeWindow( &appMPlayer.subWindow,vo_dwidth,vo_dheight ); | |
315 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y ); | |
316 } | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
317 guiIntfStruct.MovieWidth=vo_dwidth; |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5986
diff
changeset
|
318 guiIntfStruct.MovieHeight=vo_dheight; |
5789 | 319 } |
320 break; | |
5665 | 321 #ifdef USE_DVDREAD |
322 case guiSetDVD: | |
323 guiIntfStruct.DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts; | |
324 guiIntfStruct.DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts; | |
325 guiIntfStruct.DVD.angles=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles; | |
326 guiIntfStruct.DVD.nr_of_audio_channels=dvdp->nr_of_channels; | |
327 memcpy( guiIntfStruct.DVD.audio_streams,dvdp->audio_streams,sizeof( dvdp->audio_streams ) ); | |
328 guiIntfStruct.DVD.nr_of_subtitles=dvdp->nr_of_subtitles; | |
329 memcpy( guiIntfStruct.DVD.subtitles,dvdp->subtitles,sizeof( dvdp->subtitles ) ); | |
330 guiIntfStruct.DVD.current_title=dvd_title + 1; | |
331 guiIntfStruct.DVD.current_chapter=dvd_chapter + 1; | |
332 guiIntfStruct.DVD.current_angle=dvd_angle + 1; | |
333 guiIntfStruct.Track=dvd_title + 1; | |
334 break; | |
335 #endif | |
6280 | 336 case guiSetStream: |
337 guiIntfStruct.StreamType=stream->type; | |
338 switch( stream->type ) | |
339 { | |
340 case STREAMTYPE_DVD: | |
341 guiGetEvent( guiSetDVD,(char *)stream->priv ); | |
342 break; | |
343 #ifdef HAVE_VCD | |
344 case STREAMTYPE_VCD: | |
345 { | |
346 int i; | |
347 for ( i=1;i < 100;i++ ) | |
348 if ( vcd_seek_to_track( stream->fd,i ) < 0 ) break; | |
349 vcd_seek_to_track( stream->fd,vcd_track ); | |
350 guiIntfStruct.VCDTracks=--i; | |
351 mp_msg( MSGT_GPLAYER,MSGL_INFO,"[interface] vcd tracks: %d\n",guiIntfStruct.VCDTracks ); | |
352 guiIntfStruct.Track=vcd_track; | |
353 break; | |
354 } | |
355 #endif | |
356 } | |
357 break; | |
4858 | 358 case guiIEvent: |
359 printf( "cmd: %d\n",(int)arg ); | |
360 switch( (int)arg ) | |
361 { | |
362 case MP_CMD_QUIT: | |
363 mplEventHandling( evExit,0 ); | |
364 break; | |
365 case MP_CMD_VO_FULLSCREEN: | |
366 mplEventHandling( evFullScreen,0 ); | |
367 break; | |
368 default: | |
369 mplEventHandling( guiCMDArray[ (int)arg - MP_CMD_GUI_EVENTS - 1 ],0 ); | |
370 } | |
371 break; | |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
372 case guiReDraw: |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
373 mplEventHandling( evRedraw,0 ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
374 break; |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
375 case guiSetVolume: |
6903 | 376 if ( audio_out ) |
377 { | |
378 float l,r; | |
379 mixer_getvolume( &l,&r ); | |
380 guiIntfStruct.Volume=(r>l?r:l); | |
381 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f; | |
382 else guiIntfStruct.Balance=50.0f; | |
383 btnModify( evSetVolume,guiIntfStruct.Volume ); | |
384 btnModify( evSetBalance,guiIntfStruct.Balance ); | |
385 } | |
386 break; | |
7009 | 387 case guiSetFileFormat: |
388 guiIntfStruct.FileFormat=(int)arg; | |
389 break; | |
6903 | 390 case guiSetValues: |
6912 | 391 // -- video |
392 if ( arg ) | |
393 { | |
394 if ( vo_gamma_brightness == 1000 ) | |
395 { vo_gamma_brightness=0; get_video_colors( (void *)arg,"brightness",&vo_gamma_brightness ); } | |
396 if ( vo_gamma_contrast == 1000 ) | |
397 { vo_gamma_contrast=0; get_video_colors( (void *)arg,"contrast",&vo_gamma_contrast ); } | |
398 if ( vo_gamma_hue == 1000 ) | |
399 { vo_gamma_hue=0; get_video_colors( (void *)arg,"hue",&vo_gamma_hue ); } | |
400 if ( vo_gamma_saturation == 1000 ) | |
401 { vo_gamma_saturation=0; get_video_colors( (void *)arg,"saturation",&vo_gamma_saturation ); } | |
402 } | |
7009 | 403 |
404 if ( guiIntfStruct.NoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); | |
405 | |
6794 | 406 // -- audio |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
407 if ( audio_out ) |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
408 { |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
409 float l,r; |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
410 mixer_getvolume( &l,&r ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
411 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
|
412 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f; |
6627 | 413 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
|
414 btnModify( evSetVolume,guiIntfStruct.Volume ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
415 btnModify( evSetBalance,guiIntfStruct.Balance ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
416 } |
6627 | 417 |
6794 | 418 if ( gtkAONoSound ) { if ( !muted ) mixer_mute(); } |
419 else if ( muted ) mixer_mute(); | |
420 | |
6627 | 421 if ( gtkEnableAudioEqualizer ) |
422 { | |
423 equalizer_t eq; | |
424 int i,j; | |
425 for ( i=0;i<6;i++ ) | |
426 for ( j=0;j<10;j++ ) | |
427 { | |
428 eq.channel=i; eq.band=j; eq.gain=gtkEquChannels[i][j]; | |
429 gtkSet( gtkSetEqualizer,0,&eq ); | |
430 } | |
431 } | |
6794 | 432 // -- subtitle |
7009 | 433 #ifdef HAVE_DXR3 |
7019 | 434 if ( !gstrcmp( video_driver,"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS && !gtkVopLAVC && !gtkVopFAME ) |
7009 | 435 { |
436 gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVCFAME ); | |
437 guiIntfStruct.Playing=0; | |
438 return True; | |
439 } | |
440 #endif | |
6627 | 441 break; |
442 case guiSetDefaults: | |
6857 | 443 if ( filename && !guiIntfStruct.Filename ) |
6794 | 444 { |
445 gtkSet( gtkDelPl,0,NULL ); guiIntfStruct.StreamType=STREAMTYPE_FILE; | |
446 guiSetFilename( guiIntfStruct.Filename,filename ); | |
447 } | |
448 | |
449 guiIntfStruct.DiskChanged=0; | |
450 | |
7009 | 451 // --- video opts |
7019 | 452 |
453 if ( !video_driver ) | |
6794 | 454 { |
6797
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
455 int i = 0; |
6903 | 456 while ( video_out_drivers[i++] ) |
457 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) | |
458 { | |
459 const vo_info_t *info = video_out_drivers[i - 1]->get_info(); | |
7019 | 460 video_driver=gstrdup( (char *)info->short_name ); |
6903 | 461 break; |
462 } | |
6794 | 463 } |
464 | |
7019 | 465 if ( !video_driver ) { gtkMessageBox( GTK_MB_FATAL,MSGTR_IDFGCVD ); exit_player( "gui init" ); } |
7009 | 466 |
467 { | |
468 int i = 0; | |
469 guiIntfStruct.NoWindow=False; | |
470 while ( video_out_drivers[i++] ) | |
471 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) | |
6794 | 472 { |
7009 | 473 const vo_info_t *info = video_out_drivers[i - 1]->get_info(); |
7019 | 474 if ( ( !gstrcmp( video_driver,(char *)info->short_name ) )&&( video_out_drivers[i - 1]->control( VOCTRL_GUI_NOWINDOW,NULL ) == VO_TRUE ) ) |
7009 | 475 { guiIntfStruct.NoWindow=True; break; } |
6794 | 476 } |
7009 | 477 } |
478 | |
479 #ifdef HAVE_DXR3 | |
480 remove_vop( "lavc" ); | |
481 remove_vop( "fame" ); | |
7019 | 482 if ( !gstrcmp( video_driver,"dxr3" ) ) |
7009 | 483 { |
484 #warning workaround for this moment. | |
485 osd_level=0; | |
486 // --- | |
487 if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) ) | |
488 { | |
489 if ( gtkVopLAVC ) add_vop( "lavc" ); | |
490 if ( gtkVopFAME ) add_vop( "fame" ); | |
491 } | |
492 } | |
493 #endif | |
494 // --- | |
7019 | 495 if ( gtkVopPP ) add_vop( "pp" ); |
496 else remove_vop( "pp" ); | |
6794 | 497 |
498 // --- audio opts | |
499 audio_delay=gtkAODelay; | |
500 if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; } | |
6840 | 501 if ( gtkAONorm ) gset( &ao_plugin_cfg.plugin_list,"volnorm" ); |
6794 | 502 if ( gtkEnableAudioEqualizer ) gset( &ao_plugin_cfg.plugin_list,"eq" ); |
503 if ( gtkAOExtraStereo ) | |
504 { | |
505 gset( &ao_plugin_cfg.plugin_list,"extrastereo" ); | |
506 ao_plugin_cfg.pl_extrastereo_mul=gtkAOExtraStereoMul; | |
507 } | |
508 mixer_device=gtkAOOSSMixer; | |
7019 | 509 if ( !gstrncmp( audio_driver,"oss",3 ) && gtkAOOSSDevice ) |
6794 | 510 { |
7019 | 511 char * tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 5 ); |
512 sprintf( tmp,"oss:%s",gtkAOOSSDevice ); | |
513 gfree( (void *)&audio_driver ); | |
6794 | 514 audio_driver=tmp; |
7019 | 515 } |
6794 | 516 |
517 // -- subtitle | |
518 #ifdef USE_SUB | |
519 sub_name=guiIntfStruct.Subtitlename; | |
520 stream_dump_type=0; | |
521 if ( gtkSubDumpMPSub ) stream_dump_type=4; | |
522 if ( gtkSubDumpSrt ) stream_dump_type=6; | |
523 gtkSubDumpMPSub=gtkSubDumpSrt=0; | |
6627 | 524 #endif |
6794 | 525 #if defined( USE_OSD ) || defined( USE_SUB ) |
526 guiLoadFont(); | |
6627 | 527 #endif |
528 | |
6794 | 529 // --- misc |
6627 | 530 if ( guiIntfStruct.AudioFile ) audio_stream=guiIntfStruct.AudioFile; |
531 else if ( guiIntfStruct.FilenameChanged ) audio_stream=NULL; | |
532 | |
533 break; | |
4798 | 534 } |
7009 | 535 return False; |
4798 | 536 } |
537 | |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
538 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
|
539 extern int mplTimer; |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
540 |
4798 | 541 void guiEventHandling( void ) |
542 { | |
7009 | 543 if ( !guiIntfStruct.Playing || guiIntfStruct.NoWindow ) wsHandleEvents(); |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
544 gtkEventHandling(); |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
545 mplTimer=GetTimerMS() / 20; |
4798 | 546 } |
6627 | 547 |
548 // --- | |
549 | |
550 float gtkEquChannels[6][10]; | |
551 | |
6713 | 552 plItem * plCurrent = NULL; |
553 plItem * plList = NULL; | |
554 plItem * plLastPlayed = NULL; | |
555 | |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
556 URLItem *URLList = NULL; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
557 |
6713 | 558 #if defined( MP_DEBUG ) && 0 |
559 void list( void ) | |
6627 | 560 { |
6713 | 561 plItem * next = plList; |
562 printf( "--- list ---\n" ); | |
563 while( next || next->next ) | |
564 { | |
565 printf( "item: %s/%s\n",next->path,next->name ); | |
566 if ( next->next ) next=next->next; else break; | |
567 } | |
568 printf( "--- end of list ---\n" ); | |
569 } | |
570 #else | |
571 #define list(); | |
572 #endif | |
573 | |
574 void * gtkSet( int cmd,float fparam, void * vparam ) | |
575 { | |
6794 | 576 mp_cmd_t * mp_cmd; |
6627 | 577 equalizer_t * eq = (equalizer_t *)vparam; |
6713 | 578 plItem * item = (plItem *)vparam; |
6627 | 579 |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
580 URLItem * url_item = (URLItem *)vparam; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
581 int is_added = True; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
582 |
6627 | 583 switch ( cmd ) |
584 { | |
6713 | 585 // --- handle playlist |
6755 | 586 case gtkAddPlItem: // add item to playlist |
6713 | 587 if ( plList ) |
588 { | |
589 plItem * next = plList; | |
590 while ( next->next ) { /*printf( "%s\n",next->name );*/ next=next->next; } | |
591 next->next=item; item->prev=next; | |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
592 } else { item->prev=item->next=NULL; plCurrent=plList=item; } |
6713 | 593 list(); |
594 return NULL; | |
595 case gtkGetNextPlItem: // get current item from playlist | |
596 if ( plCurrent ) | |
597 { | |
598 plCurrent=plCurrent->next; | |
599 if ( !plCurrent && plList ) | |
600 { | |
601 plItem * next = plList; | |
602 while ( next->next ) { if ( !next->next ) break; next=next->next; } | |
603 plCurrent=next; | |
604 } | |
605 return plCurrent; | |
606 } | |
607 return NULL; | |
608 case gtkGetPrevPlItem: | |
609 if ( plCurrent ) | |
610 { | |
611 plCurrent=plCurrent->prev; | |
612 if ( !plCurrent && plList ) plCurrent=plList; | |
613 return plCurrent; | |
614 } | |
6794 | 615 return NULL; |
6713 | 616 case gtkGetCurrPlItem: // get current item |
617 return plCurrent; | |
618 case gtkDelPl: // delete list | |
619 { | |
620 plItem * curr = plList; | |
621 plItem * next; | |
622 if ( !plList ) return NULL; | |
623 if ( !curr->next ) | |
624 { | |
625 if ( curr->path ) free( curr->path ); | |
626 if ( curr->name ) free( curr->name ); | |
627 free( curr ); | |
628 } | |
629 else | |
630 { | |
631 while ( curr->next ) | |
632 { | |
633 next=curr->next; | |
634 if ( curr->path ) free( curr->path ); | |
635 if ( curr->name ) free( curr->name ); | |
636 free( curr ); | |
637 curr=next; | |
638 } | |
639 } | |
640 plList=NULL; plCurrent=NULL; | |
641 } | |
642 return NULL; | |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
643 // ----- Handle url |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
644 case gtkAddURLItem: |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
645 if ( URLList ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
646 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
647 URLItem * next_url = URLList; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
648 is_added = False; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
649 while ( next_url->next ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
650 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
651 if ( !gstrcmp( next_url->url,url_item->url ) ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
652 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
653 is_added=True; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
654 break; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
655 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
656 next_url=next_url->next; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
657 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
658 if ( ( !is_added )&&( gstrcmp( next_url->url,url_item->url ) ) ) next_url->next=url_item; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
659 } else { url_item->next=NULL; URLList=url_item; } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
660 return NULL; |
6794 | 661 // --- subtitle |
662 case gtkSetSubAuto: | |
7019 | 663 sub_auto=(int)fparam; |
6794 | 664 return NULL; |
665 case gtkSetSubDelay: | |
7019 | 666 sub_delay=fparam; |
6794 | 667 return NULL; |
668 case gtkSetSubFPS: | |
7019 | 669 sub_fps=(int)fparam; |
6794 | 670 return NULL; |
671 case gtkSetSubPos: | |
7019 | 672 sub_pos=(int)fparam; |
6794 | 673 return NULL; |
674 #if defined( USE_OSD ) || defined( USE_SUB ) | |
7139 | 675 #ifndef HAVE_FREETYPE |
6794 | 676 case gtkSetFontFactor: |
7019 | 677 font_factor=fparam; |
6794 | 678 guiLoadFont(); |
679 return NULL; | |
7139 | 680 #else |
681 case gtkSetFontOutLine: | |
682 subtitle_font_thickness=( 8.0f / 100.0f ) * fparam; | |
683 guiLoadFont(); | |
684 return NULL; | |
685 case gtkSetFontBlur: | |
686 subtitle_font_radius=( 8.0f / 100.0f ) * fparam; | |
687 guiLoadFont(); | |
688 return NULL; | |
689 case gtkSetFontTextScale: | |
690 text_font_scale_factor=fparam; | |
691 guiLoadFont(); | |
692 return NULL; | |
693 case gtkSetFontOSDScale: | |
694 osd_font_scale_factor=fparam; | |
695 guiLoadFont(); | |
696 return NULL; | |
697 case gtkSetFontEncoding: | |
698 if ( subtitle_font_encoding ) free( subtitle_font_encoding ); | |
699 subtitle_font_encoding=gstrdup( (char *)vparam ); | |
700 guiLoadFont(); | |
701 return NULL; | |
702 case gtkSetFontAutoScale: | |
703 subtitle_autoscale=(int)fparam; | |
704 guiLoadFont(); | |
705 return NULL; | |
706 #endif | |
6794 | 707 #endif |
708 // --- misc | |
709 case gtkClearStruct: | |
7009 | 710 if ( (unsigned int)vparam & guiFilenames ) |
6794 | 711 { |
712 gfree( (void **)&guiIntfStruct.Filename ); | |
713 gfree( (void **)&guiIntfStruct.Subtitlename ); | |
714 gfree( (void **)&guiIntfStruct.AudioFile ); | |
7009 | 715 gtkSet( gtkDelPl,0,NULL ); |
6794 | 716 } |
717 #ifdef USE_DVDREAD | |
7009 | 718 if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) ); |
6794 | 719 #endif |
720 #ifdef HAVE_VCD | |
7009 | 721 if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0; |
6794 | 722 #endif |
723 return NULL; | |
724 case gtkSetExtraStereo: | |
725 gtkAOExtraStereoMul=fparam; | |
726 audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(int)>kAOExtraStereoMul ); | |
727 return NULL; | |
728 case gtkSetAudioDelay: | |
729 audio_delay=gtkAODelay=fparam; | |
730 return NULL; | |
731 case gtkSetPanscan: | |
732 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); | |
733 mp_cmd->id=MP_CMD_PANSCAN; mp_cmd->name=strdup( "panscan" ); | |
734 mp_cmd->args[0].v.f=fparam; mp_cmd->args[1].v.i=1; | |
735 mp_input_queue_cmd( mp_cmd ); | |
736 return NULL; | |
737 case gtkSetAutoq: | |
7019 | 738 auto_quality=(int)fparam; |
6794 | 739 return NULL; |
6713 | 740 // --- set equalizers |
6627 | 741 case gtkSetContrast: |
6794 | 742 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); |
6627 | 743 mp_cmd->id=MP_CMD_CONTRAST; mp_cmd->name=strdup( "contrast" ); |
744 break; | |
745 case gtkSetBrightness: | |
6794 | 746 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); |
6627 | 747 mp_cmd->id=MP_CMD_BRIGHTNESS; mp_cmd->name=strdup( "brightness" ); |
748 break; | |
749 case gtkSetHue: | |
6794 | 750 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); |
6627 | 751 mp_cmd->id=MP_CMD_HUE; mp_cmd->name=strdup( "hue" ); |
752 break; | |
753 case gtkSetSaturation: | |
6794 | 754 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); |
6627 | 755 mp_cmd->id=MP_CMD_SATURATION; mp_cmd->name=strdup( "saturation" ); |
756 break; | |
757 case gtkSetEqualizer: | |
758 if ( eq ) | |
759 { | |
760 gtkEquChannels[eq->channel][eq->band]=eq->gain; | |
761 audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)eq ); | |
762 } | |
763 else | |
764 { | |
765 int i,j; equalizer_t tmp; tmp.gain=0.0f; | |
766 memset( gtkEquChannels,0,sizeof( gtkEquChannels ) ); | |
767 for ( i=0;i<6;i++ ) | |
768 for ( j=0;j<10;j++ ) | |
769 { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)&tmp ); } | |
770 } | |
6713 | 771 return NULL; |
6794 | 772 default: return NULL; |
6627 | 773 } |
774 mp_cmd->args[0].v.i=(int)fparam; | |
775 mp_cmd->args[1].v.i=1; | |
776 mp_input_queue_cmd( mp_cmd ); | |
6713 | 777 return NULL; |
6627 | 778 } |