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