Mercurial > mplayer.hg
annotate Gui/interface.c @ 7081:66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
now the packets can be encapsulated into avi or other file formats
- skip redundant/resent fragments (bit 0x20 set of first byte of frag)
author | arpi |
---|---|
date | Sat, 24 Aug 2002 22:39:27 +0000 |
parents | e37a67d5e117 |
children | 8e9607c5897e |
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 |
33 #ifdef __FreeBSD__ | |
34 #include <giconv.h> | |
35 #else | |
36 #include <iconv.h> | |
37 #endif | |
38 #endif | |
39 | |
5665 | 40 #include "../libmpdemux/stream.h" |
5789 | 41 #include "../libmpdemux/demuxer.h" |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
42 |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
43 guiInterface_t guiIntfStruct; |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
44 |
6627 | 45 char * gstrcat( char ** dest,char * src ) |
46 { | |
47 char * tmp = NULL; | |
48 | |
49 if ( !src ) return NULL; | |
50 | |
51 if ( *dest ) | |
52 { | |
53 tmp=malloc( strlen( *dest ) + strlen( src ) + 1 ); | |
54 strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest ); | |
55 } | |
56 else | |
57 { tmp=malloc( strlen( src ) + 1 ); strcpy( tmp,src ); } | |
58 *dest=tmp; | |
59 return tmp; | |
60 } | |
61 | |
6794 | 62 int gstrcmp( char * a,char * b ) |
63 { | |
64 if ( !a && !b ) return 0; | |
65 if ( !a || !b ) return -1; | |
66 return strcmp( a,b ); | |
67 } | |
68 | |
7019 | 69 int gstrncmp( char * a,char * b,int size ) |
70 { | |
71 if ( !a && !b ) return 0; | |
72 if ( !a || !b ) return -1; | |
73 return strncmp( a,b,size ); | |
74 } | |
75 | |
6794 | 76 char * gstrdup( char * str ) |
77 { | |
78 if ( !str ) return NULL; | |
79 return strdup( str ); | |
80 } | |
81 | |
82 void gfree( void ** p ) | |
83 { | |
84 if ( *p == NULL ) return; | |
85 free( *p ); *p=NULL; | |
86 } | |
87 | |
88 void gset( char ** str,char * what ) | |
89 { | |
90 if ( *str ) { if ( !strstr( *str,what ) ) gstrcat( str,"," ); gstrcat( str,what ); } | |
91 else gstrcat( str,what ); | |
92 } | |
93 | |
6996 | 94 #ifdef USE_ICONV |
95 char * gconvert_uri_to_filename( char * str ) | |
96 { | |
97 iconv_t d; | |
98 char * out = strdup( str ); | |
99 char * tmp = NULL; | |
100 char * ize; | |
101 size_t inb,outb; | |
102 char * charset = "ISO8859-1"; | |
103 char * cs; | |
104 | |
105 if ( !strchr( str,'%' ) ) return str; | |
106 | |
107 { | |
108 char * t = calloc( 1,strlen( out ) ); | |
109 int i,c = 0; | |
110 for ( i=0;i < (int)strlen( out );i++ ) | |
111 if ( out[i] != '%' ) t[c++]=out[i]; | |
112 else | |
113 { | |
114 char tmp[4] = "0xXX"; | |
115 // if ( out[++i] == '%' ) { t[c++]='%'; continue; }; | |
116 tmp[2]=out[++i]; tmp[3]=out[++i]; | |
117 t[c++]=(char)strtol( tmp,(char **)NULL,0 ); | |
118 } | |
119 free( out ); | |
120 out=t; | |
121 } | |
122 | |
123 if ( (cs=getenv( "CHARSET" )) && *cs ) charset=cs; | |
124 | |
125 inb=outb=strlen( out ); | |
126 tmp=calloc( 1,outb + 1 ); | |
127 ize=tmp; | |
128 d=iconv_open( charset,"UTF-8" ); | |
129 if ( (iconv_t)(-1) == d ) return str; | |
130 iconv( d,&out,&inb,&tmp,&outb ); | |
131 iconv_close( d ); | |
132 free( out ); | |
133 return ize; | |
134 } | |
135 #endif | |
136 | |
6218 | 137 void guiInit( void ) |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
138 { |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
139 memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) ); |
6898 | 140 guiIntfStruct.Balance=50.0f; |
141 guiIntfStruct.StreamType=-1; | |
142 | |
6627 | 143 memset( >kEquChannels,0,sizeof( gtkEquChannels ) ); |
6794 | 144 gtkAOOSSMixer=strdup( PATH_DEV_MIXER ); |
145 gtkAOOSSDevice=strdup( PATH_DEV_DSP ); | |
6898 | 146 |
147 gtkInit(); | |
6912 | 148 wsXInit( (void *)mDisplay ); |
149 | |
7019 | 150 // cfg_read(); |
6218 | 151 appInit( (void*)mDisplay ); |
6898 | 152 |
7009 | 153 if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE ); |
6973 | 154 if ( sub_name ) guiSetFilename( guiIntfStruct.Subtitlename,sub_name ); |
6797
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
155 #if defined( USE_OSD ) || defined( USE_SUB ) |
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
156 guiLoadFont(); |
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
157 #endif |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
158 } |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
159 |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
160 void guiDone( void ) |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
161 { |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
162 mp_msg( MSGT_GPLAYER,MSGL_V,"[mplayer] exit.\n" ); |
6794 | 163 cfg_write(); |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
164 gtkDone(); |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
165 wsXDone(); |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
166 } |
4798 | 167 |
4858 | 168 int guiCMDArray[] = |
169 { | |
170 evLoad, | |
171 evLoadSubtitle, | |
172 evAbout, | |
173 evPlay, | |
174 evStop, | |
175 evPlayList, | |
176 evPreferences, | |
177 evFullScreen, | |
178 evSkinBrowser | |
179 }; | |
180 | |
5789 | 181 typedef struct |
182 { | |
183 demux_stream_t *ds; | |
184 unsigned int format; | |
185 struct codecs_st *codec; | |
186 int inited; | |
187 // output format: | |
188 float timer; | |
189 float fps; | |
190 float frametime; | |
191 int i_bps; | |
192 int disp_w,disp_h; | |
193 } tmp_sh_video_t; | |
194 | |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
195 extern ao_functions_t * audio_out; |
6755 | 196 extern vo_functions_t * video_out; |
6794 | 197 extern int frame_dropping; |
198 extern int stream_dump_type; | |
199 extern char ** vo_plugin_args; | |
200 | |
201 #if defined( USE_OSD ) || defined( USE_SUB ) | |
202 void guiLoadFont( void ) | |
203 { | |
204 if ( vo_font ) | |
205 { | |
206 int i; | |
207 if ( vo_font->name ) free( vo_font->name ); | |
208 if ( vo_font->fpath ) free( vo_font->fpath ); | |
209 for ( i=0;i<16;i++ ) | |
210 if ( vo_font->pic_a[i] ) | |
211 { | |
212 if ( vo_font->pic_a[i]->bmp ) free( vo_font->pic_a[i]->bmp ); | |
213 if ( vo_font->pic_a[i]->pal ) free( vo_font->pic_a[i]->pal ); | |
214 } | |
215 for ( i=0;i<16;i++ ) | |
216 if ( vo_font->pic_b[i] ) | |
217 { | |
218 if ( vo_font->pic_b[i]->bmp ) free( vo_font->pic_b[i]->bmp ); | |
219 if ( vo_font->pic_b[i]->pal ) free( vo_font->pic_b[i]->pal ); | |
220 } | |
221 free( vo_font ); vo_font=NULL; | |
222 } | |
7019 | 223 if ( font_name ) |
6794 | 224 { |
7019 | 225 vo_font=read_font_desc( font_name,font_factor,0 ); |
6794 | 226 if ( !vo_font ) mp_msg( MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name ); |
227 } | |
228 else | |
229 { | |
7019 | 230 font_name=gstrdup( get_path( "font/font.desc" ) ); |
231 vo_font=read_font_desc( font_name,font_factor,0 ); | |
6794 | 232 if ( !vo_font ) |
233 { | |
7019 | 234 gfree( (void **)&font_name ); font_name=gstrdup( DATADIR"/font/font.desc" ); |
235 vo_font=read_font_desc( font_name,font_factor,0 ); | |
6794 | 236 } |
237 } | |
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; | |
5120 | 358 #ifdef HAVE_NEW_INPUT |
4858 | 359 case guiIEvent: |
360 printf( "cmd: %d\n",(int)arg ); | |
361 switch( (int)arg ) | |
362 { | |
363 case MP_CMD_QUIT: | |
364 mplEventHandling( evExit,0 ); | |
365 break; | |
366 case MP_CMD_VO_FULLSCREEN: | |
367 mplEventHandling( evFullScreen,0 ); | |
368 break; | |
369 default: | |
370 mplEventHandling( guiCMDArray[ (int)arg - MP_CMD_GUI_EVENTS - 1 ],0 ); | |
371 } | |
372 break; | |
5120 | 373 #endif |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
374 case guiReDraw: |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
375 mplEventHandling( evRedraw,0 ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
376 break; |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
377 case guiSetVolume: |
6903 | 378 if ( audio_out ) |
379 { | |
380 float l,r; | |
381 mixer_getvolume( &l,&r ); | |
382 guiIntfStruct.Volume=(r>l?r:l); | |
383 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f; | |
384 else guiIntfStruct.Balance=50.0f; | |
385 btnModify( evSetVolume,guiIntfStruct.Volume ); | |
386 btnModify( evSetBalance,guiIntfStruct.Balance ); | |
387 } | |
388 break; | |
7009 | 389 case guiSetFileFormat: |
390 guiIntfStruct.FileFormat=(int)arg; | |
391 break; | |
6903 | 392 case guiSetValues: |
6912 | 393 // -- video |
394 if ( arg ) | |
395 { | |
396 if ( vo_gamma_brightness == 1000 ) | |
397 { vo_gamma_brightness=0; get_video_colors( (void *)arg,"brightness",&vo_gamma_brightness ); } | |
398 if ( vo_gamma_contrast == 1000 ) | |
399 { vo_gamma_contrast=0; get_video_colors( (void *)arg,"contrast",&vo_gamma_contrast ); } | |
400 if ( vo_gamma_hue == 1000 ) | |
401 { vo_gamma_hue=0; get_video_colors( (void *)arg,"hue",&vo_gamma_hue ); } | |
402 if ( vo_gamma_saturation == 1000 ) | |
403 { vo_gamma_saturation=0; get_video_colors( (void *)arg,"saturation",&vo_gamma_saturation ); } | |
404 } | |
7009 | 405 |
406 if ( guiIntfStruct.NoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); | |
407 | |
6794 | 408 // -- audio |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
409 if ( audio_out ) |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
410 { |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
411 float l,r; |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
412 mixer_getvolume( &l,&r ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
413 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
|
414 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f; |
6627 | 415 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
|
416 btnModify( evSetVolume,guiIntfStruct.Volume ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
417 btnModify( evSetBalance,guiIntfStruct.Balance ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
418 } |
6627 | 419 |
6794 | 420 if ( gtkAONoSound ) { if ( !muted ) mixer_mute(); } |
421 else if ( muted ) mixer_mute(); | |
422 | |
6627 | 423 if ( gtkEnableAudioEqualizer ) |
424 { | |
425 equalizer_t eq; | |
426 int i,j; | |
427 for ( i=0;i<6;i++ ) | |
428 for ( j=0;j<10;j++ ) | |
429 { | |
430 eq.channel=i; eq.band=j; eq.gain=gtkEquChannels[i][j]; | |
431 gtkSet( gtkSetEqualizer,0,&eq ); | |
432 } | |
433 } | |
6794 | 434 // -- subtitle |
7009 | 435 #ifdef HAVE_DXR3 |
7019 | 436 if ( !gstrcmp( video_driver,"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS && !gtkVopLAVC && !gtkVopFAME ) |
7009 | 437 { |
438 gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVCFAME ); | |
439 guiIntfStruct.Playing=0; | |
440 return True; | |
441 } | |
442 #endif | |
6627 | 443 break; |
444 case guiSetDefaults: | |
6857 | 445 if ( filename && !guiIntfStruct.Filename ) |
6794 | 446 { |
447 gtkSet( gtkDelPl,0,NULL ); guiIntfStruct.StreamType=STREAMTYPE_FILE; | |
448 guiSetFilename( guiIntfStruct.Filename,filename ); | |
449 } | |
450 | |
451 guiIntfStruct.DiskChanged=0; | |
452 | |
7009 | 453 // --- video opts |
7019 | 454 |
455 if ( !video_driver ) | |
6794 | 456 { |
6797
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
457 int i = 0; |
6903 | 458 while ( video_out_drivers[i++] ) |
459 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) | |
460 { | |
461 const vo_info_t *info = video_out_drivers[i - 1]->get_info(); | |
7019 | 462 video_driver=gstrdup( (char *)info->short_name ); |
6903 | 463 break; |
464 } | |
6794 | 465 } |
466 | |
7019 | 467 if ( !video_driver ) { gtkMessageBox( GTK_MB_FATAL,MSGTR_IDFGCVD ); exit_player( "gui init" ); } |
7009 | 468 |
469 { | |
470 int i = 0; | |
471 guiIntfStruct.NoWindow=False; | |
472 while ( video_out_drivers[i++] ) | |
473 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) | |
6794 | 474 { |
7009 | 475 const vo_info_t *info = video_out_drivers[i - 1]->get_info(); |
7019 | 476 if ( ( !gstrcmp( video_driver,(char *)info->short_name ) )&&( video_out_drivers[i - 1]->control( VOCTRL_GUI_NOWINDOW,NULL ) == VO_TRUE ) ) |
7009 | 477 { guiIntfStruct.NoWindow=True; break; } |
6794 | 478 } |
7009 | 479 } |
480 | |
481 #ifdef HAVE_DXR3 | |
482 remove_vop( "lavc" ); | |
483 remove_vop( "fame" ); | |
7019 | 484 if ( !gstrcmp( video_driver,"dxr3" ) ) |
7009 | 485 { |
486 #warning workaround for this moment. | |
487 osd_level=0; | |
488 // --- | |
489 if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) ) | |
490 { | |
491 if ( gtkVopLAVC ) add_vop( "lavc" ); | |
492 if ( gtkVopFAME ) add_vop( "fame" ); | |
493 } | |
494 } | |
495 #endif | |
496 // --- | |
7019 | 497 if ( gtkVopPP ) add_vop( "pp" ); |
498 else remove_vop( "pp" ); | |
6794 | 499 |
500 // --- audio opts | |
501 audio_delay=gtkAODelay; | |
502 if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; } | |
6840 | 503 if ( gtkAONorm ) gset( &ao_plugin_cfg.plugin_list,"volnorm" ); |
6794 | 504 if ( gtkEnableAudioEqualizer ) gset( &ao_plugin_cfg.plugin_list,"eq" ); |
505 if ( gtkAOExtraStereo ) | |
506 { | |
507 gset( &ao_plugin_cfg.plugin_list,"extrastereo" ); | |
508 ao_plugin_cfg.pl_extrastereo_mul=gtkAOExtraStereoMul; | |
509 } | |
510 mixer_device=gtkAOOSSMixer; | |
7019 | 511 if ( !gstrncmp( audio_driver,"oss",3 ) && gtkAOOSSDevice ) |
6794 | 512 { |
7019 | 513 char * tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 5 ); |
514 sprintf( tmp,"oss:%s",gtkAOOSSDevice ); | |
515 gfree( (void *)&audio_driver ); | |
6794 | 516 audio_driver=tmp; |
7019 | 517 } |
6794 | 518 |
519 // -- subtitle | |
520 #ifdef USE_SUB | |
521 sub_name=guiIntfStruct.Subtitlename; | |
522 stream_dump_type=0; | |
523 if ( gtkSubDumpMPSub ) stream_dump_type=4; | |
524 if ( gtkSubDumpSrt ) stream_dump_type=6; | |
525 gtkSubDumpMPSub=gtkSubDumpSrt=0; | |
6627 | 526 #endif |
6794 | 527 #if defined( USE_OSD ) || defined( USE_SUB ) |
528 guiLoadFont(); | |
6627 | 529 #endif |
530 | |
6794 | 531 // --- misc |
6627 | 532 if ( guiIntfStruct.AudioFile ) audio_stream=guiIntfStruct.AudioFile; |
533 else if ( guiIntfStruct.FilenameChanged ) audio_stream=NULL; | |
534 | |
535 break; | |
4798 | 536 } |
7009 | 537 return False; |
4798 | 538 } |
539 | |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
540 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
|
541 extern int mplTimer; |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
542 |
4798 | 543 void guiEventHandling( void ) |
544 { | |
7009 | 545 if ( !guiIntfStruct.Playing || guiIntfStruct.NoWindow ) wsHandleEvents(); |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
546 gtkEventHandling(); |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
547 mplTimer=GetTimerMS() / 20; |
4798 | 548 } |
6627 | 549 |
550 // --- | |
551 | |
552 float gtkEquChannels[6][10]; | |
553 | |
6713 | 554 plItem * plCurrent = NULL; |
555 plItem * plList = NULL; | |
556 plItem * plLastPlayed = NULL; | |
557 | |
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 |
580 switch ( cmd ) | |
581 { | |
6713 | 582 // --- handle playlist |
6755 | 583 case gtkAddPlItem: // add item to playlist |
6713 | 584 if ( plList ) |
585 { | |
586 plItem * next = plList; | |
587 while ( next->next ) { /*printf( "%s\n",next->name );*/ next=next->next; } | |
588 next->next=item; item->prev=next; | |
589 } | |
590 else { item->prev=item->next=NULL; plCurrent=plList=item; } | |
591 list(); | |
592 return NULL; | |
593 case gtkGetNextPlItem: // get current item from playlist | |
594 if ( plCurrent ) | |
595 { | |
596 plCurrent=plCurrent->next; | |
597 if ( !plCurrent && plList ) | |
598 { | |
599 plItem * next = plList; | |
600 while ( next->next ) { if ( !next->next ) break; next=next->next; } | |
601 plCurrent=next; | |
602 } | |
603 return plCurrent; | |
604 } | |
605 return NULL; | |
606 case gtkGetPrevPlItem: | |
607 if ( plCurrent ) | |
608 { | |
609 plCurrent=plCurrent->prev; | |
610 if ( !plCurrent && plList ) plCurrent=plList; | |
611 return plCurrent; | |
612 } | |
6794 | 613 return NULL; |
6713 | 614 case gtkGetCurrPlItem: // get current item |
615 return plCurrent; | |
616 case gtkDelPl: // delete list | |
617 { | |
618 plItem * curr = plList; | |
619 plItem * next; | |
620 if ( !plList ) return NULL; | |
621 if ( !curr->next ) | |
622 { | |
623 if ( curr->path ) free( curr->path ); | |
624 if ( curr->name ) free( curr->name ); | |
625 free( curr ); | |
626 } | |
627 else | |
628 { | |
629 while ( curr->next ) | |
630 { | |
631 next=curr->next; | |
632 if ( curr->path ) free( curr->path ); | |
633 if ( curr->name ) free( curr->name ); | |
634 free( curr ); | |
635 curr=next; | |
636 } | |
637 } | |
638 plList=NULL; plCurrent=NULL; | |
639 } | |
640 return NULL; | |
6794 | 641 // --- subtitle |
642 case gtkSetSubAuto: | |
7019 | 643 sub_auto=(int)fparam; |
6794 | 644 return NULL; |
645 case gtkSetSubDelay: | |
7019 | 646 sub_delay=fparam; |
6794 | 647 return NULL; |
648 case gtkSetSubFPS: | |
7019 | 649 sub_fps=(int)fparam; |
6794 | 650 return NULL; |
651 case gtkSetSubPos: | |
7019 | 652 sub_pos=(int)fparam; |
6794 | 653 return NULL; |
654 #if defined( USE_OSD ) || defined( USE_SUB ) | |
655 case gtkSetFontFactor: | |
7019 | 656 font_factor=fparam; |
6794 | 657 guiLoadFont(); |
658 return NULL; | |
659 #endif | |
660 // --- misc | |
661 case gtkClearStruct: | |
7009 | 662 if ( (unsigned int)vparam & guiFilenames ) |
6794 | 663 { |
664 gfree( (void **)&guiIntfStruct.Filename ); | |
665 gfree( (void **)&guiIntfStruct.Subtitlename ); | |
666 gfree( (void **)&guiIntfStruct.AudioFile ); | |
7009 | 667 gtkSet( gtkDelPl,0,NULL ); |
6794 | 668 } |
669 #ifdef USE_DVDREAD | |
7009 | 670 if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) ); |
6794 | 671 #endif |
672 #ifdef HAVE_VCD | |
7009 | 673 if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0; |
6794 | 674 #endif |
675 return NULL; | |
676 case gtkSetExtraStereo: | |
677 gtkAOExtraStereoMul=fparam; | |
678 audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(int)>kAOExtraStereoMul ); | |
679 return NULL; | |
680 case gtkSetAudioDelay: | |
681 audio_delay=gtkAODelay=fparam; | |
682 return NULL; | |
683 case gtkSetPanscan: | |
684 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); | |
685 mp_cmd->id=MP_CMD_PANSCAN; mp_cmd->name=strdup( "panscan" ); | |
686 mp_cmd->args[0].v.f=fparam; mp_cmd->args[1].v.i=1; | |
687 mp_input_queue_cmd( mp_cmd ); | |
688 return NULL; | |
689 case gtkSetAutoq: | |
7019 | 690 auto_quality=(int)fparam; |
6794 | 691 return NULL; |
6713 | 692 // --- set equalizers |
6627 | 693 case gtkSetContrast: |
6794 | 694 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); |
6627 | 695 mp_cmd->id=MP_CMD_CONTRAST; mp_cmd->name=strdup( "contrast" ); |
696 break; | |
697 case gtkSetBrightness: | |
6794 | 698 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); |
6627 | 699 mp_cmd->id=MP_CMD_BRIGHTNESS; mp_cmd->name=strdup( "brightness" ); |
700 break; | |
701 case gtkSetHue: | |
6794 | 702 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); |
6627 | 703 mp_cmd->id=MP_CMD_HUE; mp_cmd->name=strdup( "hue" ); |
704 break; | |
705 case gtkSetSaturation: | |
6794 | 706 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); |
6627 | 707 mp_cmd->id=MP_CMD_SATURATION; mp_cmd->name=strdup( "saturation" ); |
708 break; | |
709 case gtkSetEqualizer: | |
710 if ( eq ) | |
711 { | |
712 gtkEquChannels[eq->channel][eq->band]=eq->gain; | |
713 audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)eq ); | |
714 } | |
715 else | |
716 { | |
717 int i,j; equalizer_t tmp; tmp.gain=0.0f; | |
718 memset( gtkEquChannels,0,sizeof( gtkEquChannels ) ); | |
719 for ( i=0;i<6;i++ ) | |
720 for ( j=0;j<10;j++ ) | |
721 { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)&tmp ); } | |
722 } | |
6713 | 723 return NULL; |
6794 | 724 default: return NULL; |
6627 | 725 } |
726 mp_cmd->args[0].v.i=(int)fparam; | |
727 mp_cmd->args[1].v.i=1; | |
728 mp_input_queue_cmd( mp_cmd ); | |
6713 | 729 return NULL; |
6627 | 730 } |