Mercurial > mplayer.hg
annotate Gui/interface.c @ 9398:d709935c512d
optional loader/ (currently it does nothing until the win32 support on cygwin is disabled)
author | alex |
---|---|
date | Tue, 11 Feb 2003 18:56:17 +0000 |
parents | f38fe55d0e05 |
children | 20f0a254142d |
rev | line source |
---|---|
8058 | 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> |
8058 | 6 #include <sys/types.h> |
4798 | 7 |
8058 | 8 #include "wm/ws.h" |
9 #include "wm/wsxdnd.h" | |
4798 | 10 #include "interface.h" |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
11 #include "skin/skin.h" |
8058 | 12 |
6627 | 13 #include "mplayer/gtk/eq.h" |
8058 | 14 #include "mplayer/widgets.h" |
15 #include "mplayer/mplayer.h" | |
8423 | 16 #include "mplayer/play.h" |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
17 |
4798 | 18 #include "../mplayer.h" |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
19 #include "app.h" |
6794 | 20 #include "cfg.h" |
21 #include "../help_mp.h" | |
22 #include "../subreader.h" | |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
23 #include "../libvo/x11_common.h" |
5789 | 24 #include "../libvo/video_out.h" |
6794 | 25 #include "../libvo/font_load.h" |
7169 | 26 #include "../libvo/sub.h" |
4858 | 27 #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
|
28 #include "../libao2/audio_out.h" |
6627 | 29 #include "../mixer.h" |
30 #include "../libao2/audio_plugin.h" | |
31 #include "../libao2/eq.h" | |
5789 | 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; |
9314
f38fe55d0e05
this patch adds the option -guiwid to gmplayer. I think its a more clean
arpi
parents:
9306
diff
changeset
|
43 int guiWinID=-1; |
4818
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 | |
8284 | 82 char * gstrchr( char * str,int c ) |
83 { | |
84 if ( !str ) return NULL; | |
85 return strchr( str,c ); | |
86 } | |
87 | |
6794 | 88 void gfree( void ** p ) |
89 { | |
90 if ( *p == NULL ) return; | |
91 free( *p ); *p=NULL; | |
92 } | |
93 | |
94 void gset( char ** str,char * what ) | |
95 { | |
7887
0e5544951425
A small patch to Gui/interface.c; the first fix is a plain bug, the second is
arpi
parents:
7707
diff
changeset
|
96 if ( *str ) { if ( !strstr( *str,what ) ) { gstrcat( str,"," ); gstrcat( str,what ); }} |
6794 | 97 else gstrcat( str,what ); |
98 } | |
99 | |
7582 | 100 void gaddlist( char *** list,char * entry ) |
101 { | |
102 int i; | |
103 | |
104 if ( (*list) ) | |
105 { | |
106 for ( i=0;(*list)[i];i++ ) free( (*list)[i] ); | |
107 free( (*list) ); | |
108 } | |
109 | |
110 (*list)=malloc( 8 ); | |
111 (*list)[0]=gstrdup( entry ); | |
112 (*list)[1]=NULL; | |
113 } | |
114 | |
6996 | 115 #ifdef USE_ICONV |
116 char * gconvert_uri_to_filename( char * str ) | |
117 { | |
118 iconv_t d; | |
119 char * out = strdup( str ); | |
120 char * tmp = NULL; | |
121 char * ize; | |
122 size_t inb,outb; | |
123 char * charset = "ISO8859-1"; | |
124 char * cs; | |
125 | |
126 if ( !strchr( str,'%' ) ) return str; | |
127 | |
128 { | |
129 char * t = calloc( 1,strlen( out ) ); | |
130 int i,c = 0; | |
131 for ( i=0;i < (int)strlen( out );i++ ) | |
132 if ( out[i] != '%' ) t[c++]=out[i]; | |
133 else | |
134 { | |
135 char tmp[4] = "0xXX"; | |
136 // if ( out[++i] == '%' ) { t[c++]='%'; continue; }; | |
137 tmp[2]=out[++i]; tmp[3]=out[++i]; | |
138 t[c++]=(char)strtol( tmp,(char **)NULL,0 ); | |
139 } | |
140 free( out ); | |
141 out=t; | |
142 } | |
143 | |
144 if ( (cs=getenv( "CHARSET" )) && *cs ) charset=cs; | |
145 | |
146 inb=outb=strlen( out ); | |
147 tmp=calloc( 1,outb + 1 ); | |
148 ize=tmp; | |
149 d=iconv_open( charset,"UTF-8" ); | |
150 if ( (iconv_t)(-1) == d ) return str; | |
151 iconv( d,&out,&inb,&tmp,&outb ); | |
152 iconv_close( d ); | |
153 free( out ); | |
154 return ize; | |
155 } | |
156 #endif | |
157 | |
6218 | 158 void guiInit( void ) |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
159 { |
8058 | 160 int i; |
161 | |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
162 memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) ); |
6898 | 163 guiIntfStruct.Balance=50.0f; |
164 guiIntfStruct.StreamType=-1; | |
165 | |
6627 | 166 memset( >kEquChannels,0,sizeof( gtkEquChannels ) ); |
8600
54eac4cf587c
Lots of functions and variables specific to OSS audio are used without
arpi
parents:
8484
diff
changeset
|
167 #ifdef USE_OSS_AUDIO |
7706 | 168 if ( !gtkAOOSSMixer ) gtkAOOSSMixer=strdup( PATH_DEV_MIXER ); |
169 if ( !gtkAOOSSDevice ) gtkAOOSSDevice=strdup( PATH_DEV_DSP ); | |
8600
54eac4cf587c
Lots of functions and variables specific to OSS audio are used without
arpi
parents:
8484
diff
changeset
|
170 #endif |
7707 | 171 #ifdef HAVE_DXR3 |
7706 | 172 if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" ); |
7707 | 173 #endif |
8311 | 174 if ( stream_cache_size != -1 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; } |
175 if ( autosync && autosync != gtkAutoSync ) { gtkAutoSyncOn=1; gtkAutoSync=autosync; } | |
6898 | 176 |
177 gtkInit(); | |
8043 | 178 // --- initialize X |
6912 | 179 wsXInit( (void *)mDisplay ); |
8058 | 180 // --- load skin |
8043 | 181 skinDirInHome=get_path("Skin"); |
182 skinMPlayerDir=DATADIR "/Skin"; | |
183 printf("SKIN dir 1: '%s'\n",skinDirInHome); | |
184 printf("SKIN dir 2: '%s'\n",skinMPlayerDir); | |
185 if ( !skinName ) skinName=strdup( "default" ); | |
186 switch ( skinRead( skinName ) ) | |
187 { | |
188 case -1: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinNotFound,skinName ); exit( 0 ); | |
189 case -2: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinCfgReadError,skinName ); exit( 0 ); | |
190 } | |
8058 | 191 // --- initialize windows |
9088 | 192 if ( ( mplDrawBuffer = (unsigned char *)malloc( appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) |
8058 | 193 { |
194 fprintf( stderr,MSGTR_NEMDB ); | |
195 exit( 0 ); | |
196 } | |
9306 | 197 |
198 if (WinID>0) | |
199 { | |
200 appMPlayer.subWindow.Parent=WinID; | |
201 appMPlayer.sub.x=0; | |
202 appMPlayer.sub.y=0; | |
203 } | |
9314
f38fe55d0e05
this patch adds the option -guiwid to gmplayer. I think its a more clean
arpi
parents:
9306
diff
changeset
|
204 if (guiWinID>=0) |
f38fe55d0e05
this patch adds the option -guiwid to gmplayer. I think its a more clean
arpi
parents:
9306
diff
changeset
|
205 appMPlayer.mainWindow.Parent=guiWinID; |
9202 | 206 |
8058 | 207 wsCreateWindow( &appMPlayer.subWindow, |
208 appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height, | |
9202 | 209 wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsHideWindow,"MPlayer - Video" ); |
8058 | 210 |
211 wsDestroyImage( &appMPlayer.subWindow ); | |
212 wsCreateImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height ); | |
213 wsXDNDMakeAwareness(&appMPlayer.subWindow); | |
214 | |
8973 | 215 mplMenuInit(); |
216 mplPBInit(); | |
217 | |
8058 | 218 vo_setwindow( appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC ); |
219 | |
220 // i=wsHideFrame|wsMaxSize|wsHideWindow; | |
221 // if ( appMPlayer.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow; | |
222 i=wsShowFrame|wsMaxSize|wsHideWindow; | |
223 wsCreateWindow( &appMPlayer.mainWindow, | |
224 appMPlayer.main.x,appMPlayer.main.y,appMPlayer.main.width,appMPlayer.main.height, | |
8949 | 225 wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,i,"MPlayer" ); |
8058 | 226 |
227 wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image ); | |
228 wsXDNDMakeAwareness(&appMPlayer.mainWindow); | |
229 | |
230 #ifdef DEBUG | |
231 mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] Depth on screen: %d\n",wsDepthOnScreen ); | |
232 mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] parent: 0x%x\n",(int)appMPlayer.mainWindow.WindowID ); | |
233 mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] sub: 0x%x\n",(int)appMPlayer.subWindow.WindowID ); | |
234 #endif | |
235 | |
236 appMPlayer.mainWindow.ReDraw=(void *)mplMainDraw; | |
237 appMPlayer.mainWindow.MouseHandler=mplMainMouseHandle; | |
238 appMPlayer.mainWindow.KeyHandler=mplMainKeyHandle; | |
239 appMPlayer.mainWindow.DandDHandler=mplDandDHandler; | |
240 | |
241 appMPlayer.subWindow.ReDraw=(void *)mplSubDraw; | |
242 appMPlayer.subWindow.MouseHandler=mplSubMouseHandle; | |
243 appMPlayer.subWindow.KeyHandler=mplMainKeyHandle; | |
244 appMPlayer.subWindow.DandDHandler=mplDandDHandler; | |
245 | |
8973 | 246 wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B ); |
8058 | 247 wsClearWindow( appMPlayer.subWindow ); |
248 if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize ); | |
249 | |
250 btnModify( evSetVolume,guiIntfStruct.Volume ); | |
251 btnModify( evSetBalance,guiIntfStruct.Balance ); | |
252 btnModify( evSetMoviePosition,guiIntfStruct.Position ); | |
253 | |
254 wsSetIcon( wsDisplay,appMPlayer.mainWindow.WindowID,guiIcon,guiIconMask ); | |
255 wsSetIcon( wsDisplay,appMPlayer.subWindow.WindowID,guiIcon,guiIconMask ); | |
256 | |
257 guiIntfStruct.Playing=0; | |
258 | |
259 if ( !appMPlayer.mainDecoration ) wsWindowDecoration( &appMPlayer.mainWindow,0 ); | |
260 | |
261 wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow ); | |
9202 | 262 #if 0 |
8058 | 263 wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); |
264 | |
265 { | |
266 XEvent xev; | |
267 do { XNextEvent( wsDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != appMPlayer.subWindow.WindowID ); | |
268 appMPlayer.subWindow.Mapped=wsMapped; | |
269 } | |
270 | |
9088 | 271 if ( !fullscreen ) fullscreen=gtkLoadFullscreen; |
8058 | 272 if ( fullscreen ) |
273 { | |
274 mplFullScreen(); | |
275 btnModify( evFullScreen,btnPressed ); | |
276 } | |
9202 | 277 #else |
278 if ( gtkShowVideoWindow ) | |
279 { | |
280 wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); | |
281 { | |
282 XEvent xev; | |
283 do { XNextEvent( wsDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != appMPlayer.subWindow.WindowID ); | |
284 appMPlayer.subWindow.Mapped=wsMapped; | |
285 } | |
286 | |
287 if ( fullscreen ) | |
288 { | |
289 mplFullScreen(); | |
290 btnModify( evFullScreen,btnPressed ); | |
291 } | |
292 } | |
293 else | |
294 { | |
295 if ( fullscreen ) | |
296 { | |
297 wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); | |
298 { | |
299 XEvent xev; | |
300 do { XNextEvent( wsDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != appMPlayer.subWindow.WindowID ); | |
301 appMPlayer.subWindow.Mapped=wsMapped; | |
302 } | |
303 wsVisibleWindow( &appMPlayer.subWindow, wsShowWindow ); | |
304 | |
305 mplFullScreen(); | |
306 btnModify( evFullScreen,btnPressed ); | |
307 } | |
308 } | |
8058 | 309 #endif |
310 mplSubRender=1; | |
8043 | 311 // --- |
7538 | 312 |
8423 | 313 if ( filename ) mplSetFileName( NULL,filename,STREAMTYPE_FILE ); |
7009 | 314 if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE ); |
6973 | 315 if ( sub_name ) guiSetFilename( guiIntfStruct.Subtitlename,sub_name ); |
6797
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
316 #if defined( USE_OSD ) || defined( USE_SUB ) |
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
317 guiLoadFont(); |
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
318 #endif |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
319 } |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
320 |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
321 void guiDone( void ) |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
322 { |
8883 | 323 mplMainRender=0; |
8043 | 324 mp_msg( MSGT_GPLAYER,MSGL_V,"[gui] done.\n" ); |
6794 | 325 cfg_write(); |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
326 wsXDone(); |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
327 } |
4798 | 328 |
4858 | 329 int guiCMDArray[] = |
330 { | |
8883 | 331 evLoadPlay, |
4858 | 332 evLoadSubtitle, |
333 evAbout, | |
334 evPlay, | |
335 evStop, | |
336 evPlayList, | |
337 evPreferences, | |
338 evFullScreen, | |
339 evSkinBrowser | |
340 }; | |
341 | |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
342 extern ao_functions_t * audio_out; |
6755 | 343 extern vo_functions_t * video_out; |
6794 | 344 extern int frame_dropping; |
345 extern int stream_dump_type; | |
346 extern char ** vo_plugin_args; | |
347 | |
348 #if defined( USE_OSD ) || defined( USE_SUB ) | |
349 void guiLoadFont( void ) | |
350 { | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
351 #ifdef HAVE_FREETYPE |
8635
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
8615
diff
changeset
|
352 load_font_ft(vo_image_width, vo_image_height); |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
353 #else |
6794 | 354 if ( vo_font ) |
355 { | |
356 int i; | |
357 if ( vo_font->name ) free( vo_font->name ); | |
358 if ( vo_font->fpath ) free( vo_font->fpath ); | |
359 for ( i=0;i<16;i++ ) | |
360 if ( vo_font->pic_a[i] ) | |
361 { | |
362 if ( vo_font->pic_a[i]->bmp ) free( vo_font->pic_a[i]->bmp ); | |
363 if ( vo_font->pic_a[i]->pal ) free( vo_font->pic_a[i]->pal ); | |
364 } | |
365 for ( i=0;i<16;i++ ) | |
366 if ( vo_font->pic_b[i] ) | |
367 { | |
368 if ( vo_font->pic_b[i]->bmp ) free( vo_font->pic_b[i]->bmp ); | |
369 if ( vo_font->pic_b[i]->pal ) free( vo_font->pic_b[i]->pal ); | |
370 } | |
371 free( vo_font ); vo_font=NULL; | |
372 } | |
7019 | 373 if ( font_name ) |
6794 | 374 { |
7019 | 375 vo_font=read_font_desc( font_name,font_factor,0 ); |
6794 | 376 if ( !vo_font ) mp_msg( MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name ); |
377 } | |
378 else | |
379 { | |
7019 | 380 font_name=gstrdup( get_path( "font/font.desc" ) ); |
381 vo_font=read_font_desc( font_name,font_factor,0 ); | |
6794 | 382 if ( !vo_font ) |
383 { | |
7019 | 384 gfree( (void **)&font_name ); font_name=gstrdup( DATADIR"/font/font.desc" ); |
385 vo_font=read_font_desc( font_name,font_factor,0 ); | |
6794 | 386 } |
387 } | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
388 #endif |
6794 | 389 } |
390 #endif | |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
391 |
7150 | 392 #ifdef USE_SUB |
7169 | 393 extern mp_osd_obj_t* vo_osd_list; |
394 | |
7150 | 395 void guiLoadSubtitle( char * name ) |
396 { | |
397 if ( guiIntfStruct.Playing == 0 ) | |
398 { | |
399 guiIntfStruct.SubtitleChanged=1; | |
400 return; | |
401 } | |
402 if ( subtitles ) | |
403 { | |
7169 | 404 mp_msg( MSGT_GPLAYER,MSGL_INFO,"[gui] Delete subtitles.\n" ); |
7150 | 405 sub_free( subtitles ); |
7169 | 406 subtitles=NULL; |
7170 | 407 gfree( (void **)&sub_name ); |
7150 | 408 vo_sub=NULL; |
7169 | 409 if ( vo_osd_list ) |
410 { | |
411 int len; | |
412 mp_osd_obj_t * osd = vo_osd_list; | |
413 while ( osd ) | |
414 { | |
415 if ( osd->type == OSDTYPE_SUBTITLE ) break; | |
416 osd=osd->next; | |
417 } | |
418 if ( osd && osd->flags&OSDFLAG_VISIBLE ) | |
419 { | |
420 len=osd->stride * ( osd->bbox.y2 - osd->bbox.y1 ); | |
421 memset( osd->bitmap_buffer,0,len ); | |
422 memset( osd->alpha_buffer,0,len ); | |
423 } | |
424 } | |
7150 | 425 } |
7169 | 426 if ( name ) |
427 { | |
428 mp_msg( MSGT_GPLAYER,MSGL_INFO,"[gui] Delete Load subtitle: %s\n",name ); | |
429 sub_name=gstrdup( name ); | |
430 subtitles=sub_read_file( sub_name,guiIntfStruct.FPS ); | |
9056 | 431 if ( !subtitles ) mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_CantLoadSub,name ); |
7169 | 432 } |
7150 | 433 } |
434 #endif | |
435 | |
7009 | 436 static void add_vop( char * str ) |
437 { | |
438 mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] add video filter: %s\n",str ); | |
439 if ( vo_plugin_args ) | |
440 { | |
441 int i = 0; | |
442 while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],str ) ) { i=-1; break; } | |
443 if ( i != -1 ) | |
444 { vo_plugin_args=realloc( vo_plugin_args,( i + 2 ) * sizeof( char * ) ); vo_plugin_args[i]=strdup( str ); vo_plugin_args[i+1]=NULL; } | |
445 } else { vo_plugin_args=malloc( 2 * sizeof( char * ) ); vo_plugin_args[0]=strdup( str ); vo_plugin_args[1]=NULL; } | |
446 } | |
447 | |
448 static void remove_vop( char * str ) | |
449 { | |
450 int n = 0; | |
451 | |
452 if ( !vo_plugin_args ) return; | |
453 | |
454 mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] remove video filter: %s\n",str ); | |
455 | |
456 while ( vo_plugin_args[n++] ); n--; | |
457 if ( n > -1 ) | |
458 { | |
459 int i = 0,m = -1; | |
460 while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],str ) ) { m=i - 1; break; } | |
461 i--; | |
462 if ( m > -1 ) | |
463 { | |
464 if ( n == 1 ) { free( vo_plugin_args[0] ); free( vo_plugin_args ); vo_plugin_args=NULL; } | |
465 else memcpy( &vo_plugin_args[i],&vo_plugin_args[i + 1],( n - i ) * sizeof( char * ) ); | |
466 } | |
467 } | |
468 } | |
469 | |
470 int guiGetEvent( int type,char * arg ) | |
4798 | 471 { |
6280 | 472 stream_t * stream = (stream_t *) arg; |
5672
1f8b34f1e7c0
ifdef reading dvd args, without it non-dvd compilation fails.
eyck
parents:
5665
diff
changeset
|
473 #ifdef USE_DVDREAD |
5665 | 474 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
|
475 #endif |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
476 |
4798 | 477 switch ( type ) |
478 { | |
479 case guiXEvent: | |
8973 | 480 guiIntfStruct.event_struct=(void *)arg; |
4798 | 481 wsEvents( wsDisplay,(XEvent *)arg,NULL ); |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
482 gtkEventHandling(); |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
483 break; |
4798 | 484 case guiCEvent: |
4963 | 485 switch ( (int)arg ) |
486 { | |
9202 | 487 case guiSetPlay: |
488 guiIntfStruct.Playing=1; | |
489 if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); | |
490 break; | |
491 case guiSetStop: | |
492 guiIntfStruct.Playing=0; | |
493 if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); | |
494 break; | |
8423 | 495 case guiSetPause: guiIntfStruct.Playing=2; break; |
4963 | 496 } |
8423 | 497 mplState(); |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
498 break; |
5665 | 499 case guiSetState: |
500 mplState(); | |
501 break; | |
502 case guiSetFileName: | |
503 if ( arg ) guiSetFilename( guiIntfStruct.Filename,arg ); | |
504 break; | |
5789 | 505 case guiSetAudioOnly: |
506 guiIntfStruct.AudioOnly=(int)arg; | |
7009 | 507 if ( (int)arg ) { guiIntfStruct.NoWindow=True; wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); } |
5789 | 508 else wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); |
509 break; | |
8312
ef8c992672f4
- audio track handling in menu (idea from R«ädiger Kuhlmann)
pontscho
parents:
8311
diff
changeset
|
510 case guiSetDemuxer: |
ef8c992672f4
- audio track handling in menu (idea from R«ädiger Kuhlmann)
pontscho
parents:
8311
diff
changeset
|
511 guiIntfStruct.demuxer=(void *)arg; |
ef8c992672f4
- audio track handling in menu (idea from R«ädiger Kuhlmann)
pontscho
parents:
8311
diff
changeset
|
512 break; |
5789 | 513 case guiSetShVideo: |
514 { | |
5986 | 515 if ( !appMPlayer.subWindow.isFullScreen ) |
516 { | |
517 wsResizeWindow( &appMPlayer.subWindow,vo_dwidth,vo_dheight ); | |
518 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y ); | |
519 } | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
520 guiIntfStruct.MovieWidth=vo_dwidth; |
5997
b5fb9a927bf3
add WM detection, and wm specific fullscreen code. (???)
pontscho
parents:
5986
diff
changeset
|
521 guiIntfStruct.MovieHeight=vo_dheight; |
9314
f38fe55d0e05
this patch adds the option -guiwid to gmplayer. I think its a more clean
arpi
parents:
9306
diff
changeset
|
522 if (guiWinID>=0) |
9306 | 523 wsMoveWindow( &appMPlayer.mainWindow,0,0, vo_dheight); |
5789 | 524 } |
525 break; | |
5665 | 526 #ifdef USE_DVDREAD |
527 case guiSetDVD: | |
528 guiIntfStruct.DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts; | |
529 guiIntfStruct.DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts; | |
530 guiIntfStruct.DVD.angles=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles; | |
531 guiIntfStruct.DVD.nr_of_audio_channels=dvdp->nr_of_channels; | |
532 memcpy( guiIntfStruct.DVD.audio_streams,dvdp->audio_streams,sizeof( dvdp->audio_streams ) ); | |
533 guiIntfStruct.DVD.nr_of_subtitles=dvdp->nr_of_subtitles; | |
534 memcpy( guiIntfStruct.DVD.subtitles,dvdp->subtitles,sizeof( dvdp->subtitles ) ); | |
535 guiIntfStruct.DVD.current_title=dvd_title + 1; | |
536 guiIntfStruct.DVD.current_chapter=dvd_chapter + 1; | |
537 guiIntfStruct.DVD.current_angle=dvd_angle + 1; | |
538 guiIntfStruct.Track=dvd_title + 1; | |
539 break; | |
540 #endif | |
6280 | 541 case guiSetStream: |
542 guiIntfStruct.StreamType=stream->type; | |
543 switch( stream->type ) | |
544 { | |
7150 | 545 #ifdef USE_DVDREAD |
6280 | 546 case STREAMTYPE_DVD: |
547 guiGetEvent( guiSetDVD,(char *)stream->priv ); | |
548 break; | |
7150 | 549 #endif |
6280 | 550 #ifdef HAVE_VCD |
551 case STREAMTYPE_VCD: | |
552 { | |
553 int i; | |
554 for ( i=1;i < 100;i++ ) | |
555 if ( vcd_seek_to_track( stream->fd,i ) < 0 ) break; | |
556 vcd_seek_to_track( stream->fd,vcd_track ); | |
557 guiIntfStruct.VCDTracks=--i; | |
558 break; | |
559 } | |
560 #endif | |
7150 | 561 default: break; |
6280 | 562 } |
563 break; | |
4858 | 564 case guiIEvent: |
565 printf( "cmd: %d\n",(int)arg ); | |
566 switch( (int)arg ) | |
567 { | |
568 case MP_CMD_QUIT: | |
569 mplEventHandling( evExit,0 ); | |
570 break; | |
571 case MP_CMD_VO_FULLSCREEN: | |
572 mplEventHandling( evFullScreen,0 ); | |
573 break; | |
574 default: | |
575 mplEventHandling( guiCMDArray[ (int)arg - MP_CMD_GUI_EVENTS - 1 ],0 ); | |
576 } | |
577 break; | |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
578 case guiReDraw: |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
579 mplEventHandling( evRedraw,0 ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
580 break; |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
581 case guiSetVolume: |
6903 | 582 if ( audio_out ) |
583 { | |
584 float l,r; | |
585 mixer_getvolume( &l,&r ); | |
586 guiIntfStruct.Volume=(r>l?r:l); | |
587 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f; | |
588 else guiIntfStruct.Balance=50.0f; | |
589 btnModify( evSetVolume,guiIntfStruct.Volume ); | |
590 btnModify( evSetBalance,guiIntfStruct.Balance ); | |
591 } | |
592 break; | |
7009 | 593 case guiSetFileFormat: |
594 guiIntfStruct.FileFormat=(int)arg; | |
595 break; | |
6903 | 596 case guiSetValues: |
6912 | 597 // -- video |
7217 | 598 guiIntfStruct.sh_video=arg; |
6912 | 599 if ( arg ) |
600 { | |
7217 | 601 sh_video_t * sh = (sh_video_t *)arg; |
7150 | 602 guiIntfStruct.FPS=sh->fps; |
6912 | 603 } |
7009 | 604 |
605 if ( guiIntfStruct.NoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); | |
8280
72700fefd3dc
no seeking if stream is STREAMTYPE_STREAM (net/stdin)
pontscho
parents:
8150
diff
changeset
|
606 |
8300 | 607 if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM ) btnSet( evSetMoviePosition,btnDisabled ); |
608 else btnSet( evSetMoviePosition,btnReleased ); | |
8284 | 609 |
6794 | 610 // -- audio |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
611 if ( audio_out ) |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
612 { |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
613 float l,r; |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
614 mixer_getvolume( &l,&r ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
615 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
|
616 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f; |
6627 | 617 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
|
618 btnModify( evSetVolume,guiIntfStruct.Volume ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
619 btnModify( evSetBalance,guiIntfStruct.Balance ); |
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6280
diff
changeset
|
620 } |
6627 | 621 |
622 if ( gtkEnableAudioEqualizer ) | |
623 { | |
624 equalizer_t eq; | |
625 int i,j; | |
626 for ( i=0;i<6;i++ ) | |
627 for ( j=0;j<10;j++ ) | |
628 { | |
629 eq.channel=i; eq.band=j; eq.gain=gtkEquChannels[i][j]; | |
630 gtkSet( gtkSetEqualizer,0,&eq ); | |
631 } | |
632 } | |
6794 | 633 // -- subtitle |
7009 | 634 #ifdef HAVE_DXR3 |
8043 | 635 if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS |
636 #ifdef USE_LIBAVCODEC | |
637 && !gtkVopLAVC | |
638 #endif | |
639 #ifdef USE_LIBFAME | |
640 && !gtkVopFAME | |
641 #endif | |
642 ) | |
7009 | 643 { |
644 gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVCFAME ); | |
645 guiIntfStruct.Playing=0; | |
646 return True; | |
647 } | |
648 #endif | |
6627 | 649 break; |
650 case guiSetDefaults: | |
9055 | 651 // if ( guiIntfStruct.Playing == 1 && guiIntfStruct.FilenameChanged ) |
652 if ( guiIntfStruct.FilenameChanged ) | |
8423 | 653 { |
654 audio_id=-1; | |
655 video_id=-1; | |
656 dvdsub_id=-1; | |
657 vobsub_id=-1; | |
658 stream_cache_size=-1; | |
659 autosync=0; | |
660 vcd_track=0; | |
661 dvd_title=0; | |
9055 | 662 force_fps=0; |
8423 | 663 } |
664 wsPostRedisplay( &appMPlayer.subWindow ); | |
665 break; | |
666 case guiSetParameters: | |
9055 | 667 guiGetEvent( guiSetDefaults,NULL ); |
8423 | 668 switch ( guiIntfStruct.StreamType ) |
669 { | |
670 case STREAMTYPE_PLAYLIST: | |
671 break; | |
672 #ifdef HAVE_VCD | |
673 case STREAMTYPE_VCD: | |
674 vcd_track=guiIntfStruct.Track; | |
675 break; | |
676 #endif | |
677 #ifdef USE_DVDREAD | |
678 case STREAMTYPE_DVD: | |
679 dvd_title=guiIntfStruct.Title; | |
680 dvd_chapter=guiIntfStruct.Chapter; | |
681 dvd_angle=guiIntfStruct.Angle; | |
682 break; | |
683 #endif | |
6794 | 684 } |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
685 //if ( guiIntfStruct.StreamType != STREAMTYPE_PLAYLIST ) // Does not make problems anymore! |
8423 | 686 { |
687 if ( guiIntfStruct.Filename ) filename=gstrdup( guiIntfStruct.Filename ); | |
688 else if ( filename ) guiSetFilename( guiIntfStruct.Filename,filename ); | |
689 } | |
7009 | 690 // --- video opts |
7019 | 691 |
7582 | 692 if ( !video_driver_list ) |
6794 | 693 { |
6797
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
694 int i = 0; |
6903 | 695 while ( video_out_drivers[i++] ) |
696 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) | |
697 { | |
8150 | 698 gaddlist( &video_driver_list,(char *)video_out_drivers[i - 1]->info->short_name ); |
6903 | 699 break; |
700 } | |
6794 | 701 } |
702 | |
7582 | 703 if ( !video_driver_list && !video_driver_list[0] ) { gtkMessageBox( GTK_MB_FATAL,MSGTR_IDFGCVD ); exit_player( "gui init" ); } |
7009 | 704 |
705 { | |
706 int i = 0; | |
707 guiIntfStruct.NoWindow=False; | |
708 while ( video_out_drivers[i++] ) | |
709 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) | |
6794 | 710 { |
8150 | 711 if ( ( video_driver_list && !gstrcmp( video_driver_list[0],(char *)video_out_drivers[i - 1]->info->short_name ) )&&( video_out_drivers[i - 1]->control( VOCTRL_GUI_NOWINDOW,NULL ) == VO_TRUE ) ) |
7009 | 712 { guiIntfStruct.NoWindow=True; break; } |
6794 | 713 } |
7009 | 714 } |
715 | |
716 #ifdef HAVE_DXR3 | |
8043 | 717 #ifdef USE_LIBAVCODEC |
7009 | 718 remove_vop( "lavc" ); |
8043 | 719 #endif |
720 #ifdef USE_LIBFAME | |
7009 | 721 remove_vop( "fame" ); |
8043 | 722 #endif |
7582 | 723 if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) ) |
7009 | 724 { |
725 if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) ) | |
726 { | |
8043 | 727 #ifdef USE_LIBAVCODEC |
7009 | 728 if ( gtkVopLAVC ) add_vop( "lavc" ); |
8043 | 729 #endif |
730 #ifdef USE_LIBFAME | |
7009 | 731 if ( gtkVopFAME ) add_vop( "fame" ); |
8043 | 732 #endif |
7009 | 733 } |
734 } | |
735 #endif | |
736 // --- | |
7019 | 737 if ( gtkVopPP ) add_vop( "pp" ); |
738 else remove_vop( "pp" ); | |
6794 | 739 |
740 // --- audio opts | |
7887
0e5544951425
A small patch to Gui/interface.c; the first fix is a plain bug, the second is
arpi
parents:
7707
diff
changeset
|
741 // if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; } |
6840 | 742 if ( gtkAONorm ) gset( &ao_plugin_cfg.plugin_list,"volnorm" ); |
6794 | 743 if ( gtkEnableAudioEqualizer ) gset( &ao_plugin_cfg.plugin_list,"eq" ); |
744 if ( gtkAOExtraStereo ) | |
745 { | |
746 gset( &ao_plugin_cfg.plugin_list,"extrastereo" ); | |
747 ao_plugin_cfg.pl_extrastereo_mul=gtkAOExtraStereoMul; | |
748 } | |
8600
54eac4cf587c
Lots of functions and variables specific to OSS audio are used without
arpi
parents:
8484
diff
changeset
|
749 #ifdef USE_OSS_AUDIO |
8484 | 750 mixer_device=gstrdup( gtkAOOSSMixer ); |
7582 | 751 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"oss",3 ) && gtkAOOSSDevice ) |
6794 | 752 { |
8423 | 753 char * tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 7 ); |
7019 | 754 sprintf( tmp,"oss:%s",gtkAOOSSDevice ); |
7582 | 755 gaddlist( &audio_driver_list,tmp ); |
7019 | 756 } |
8615 | 757 #endif |
8714
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8635
diff
changeset
|
758 #ifdef HAVE_SDL |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8635
diff
changeset
|
759 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) && gtkAOSDLDriver ) |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8635
diff
changeset
|
760 { |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8635
diff
changeset
|
761 char * tmp = calloc( 1,strlen( gtkAOSDLDriver ) + 10 ); |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8635
diff
changeset
|
762 sprintf( tmp,"sdl:%s",gtkAOSDLDriver ); |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8635
diff
changeset
|
763 gaddlist( &audio_driver_list,tmp ); |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8635
diff
changeset
|
764 } |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8635
diff
changeset
|
765 #endif |
6794 | 766 // -- subtitle |
767 #ifdef USE_SUB | |
7170 | 768 sub_name=gstrdup( guiIntfStruct.Subtitlename ); |
6794 | 769 stream_dump_type=0; |
770 if ( gtkSubDumpMPSub ) stream_dump_type=4; | |
771 if ( gtkSubDumpSrt ) stream_dump_type=6; | |
772 gtkSubDumpMPSub=gtkSubDumpSrt=0; | |
6627 | 773 #endif |
6794 | 774 #if defined( USE_OSD ) || defined( USE_SUB ) |
775 guiLoadFont(); | |
6627 | 776 #endif |
777 | |
6794 | 778 // --- misc |
8423 | 779 if ( gtkCacheOn ) stream_cache_size=gtkCacheSize; |
8484 | 780 if ( gtkAutoSyncOn ) autosync=gtkAutoSync; |
8423 | 781 |
8484 | 782 if ( guiIntfStruct.AudioFile ) audio_stream=gstrdup( guiIntfStruct.AudioFile ); |
783 else if ( guiIntfStruct.FilenameChanged ) gfree( (void**)&audio_stream ); | |
784 //audio_stream=NULL; | |
6627 | 785 |
8423 | 786 guiIntfStruct.DiskChanged=0; |
787 guiIntfStruct.FilenameChanged=0; | |
788 guiIntfStruct.NewPlay=0; | |
789 | |
6627 | 790 break; |
4798 | 791 } |
7009 | 792 return False; |
4798 | 793 } |
794 | |
795 void guiEventHandling( void ) | |
796 { | |
7009 | 797 if ( !guiIntfStruct.Playing || guiIntfStruct.NoWindow ) wsHandleEvents(); |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4798
diff
changeset
|
798 gtkEventHandling(); |
4798 | 799 } |
6627 | 800 |
801 // --- | |
802 | |
803 float gtkEquChannels[6][10]; | |
804 | |
6713 | 805 plItem * plCurrent = NULL; |
806 plItem * plList = NULL; | |
807 plItem * plLastPlayed = NULL; | |
808 | |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
809 URLItem *URLList = NULL; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
810 |
9055 | 811 char *fsHistory[fsPersistant_MaxPos] = { NULL,NULL,NULL,NULL,NULL }; |
812 | |
6713 | 813 #if defined( MP_DEBUG ) && 0 |
814 void list( void ) | |
6627 | 815 { |
6713 | 816 plItem * next = plList; |
817 printf( "--- list ---\n" ); | |
818 while( next || next->next ) | |
819 { | |
820 printf( "item: %s/%s\n",next->path,next->name ); | |
821 if ( next->next ) next=next->next; else break; | |
822 } | |
823 printf( "--- end of list ---\n" ); | |
824 } | |
825 #else | |
826 #define list(); | |
827 #endif | |
828 | |
829 void * gtkSet( int cmd,float fparam, void * vparam ) | |
830 { | |
6627 | 831 equalizer_t * eq = (equalizer_t *)vparam; |
6713 | 832 plItem * item = (plItem *)vparam; |
6627 | 833 |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
834 URLItem * url_item = (URLItem *)vparam; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
835 int is_added = True; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
836 |
6627 | 837 switch ( cmd ) |
838 { | |
6713 | 839 // --- handle playlist |
6755 | 840 case gtkAddPlItem: // add item to playlist |
6713 | 841 if ( plList ) |
842 { | |
843 plItem * next = plList; | |
844 while ( next->next ) { /*printf( "%s\n",next->name );*/ next=next->next; } | |
845 next->next=item; item->prev=next; | |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
846 } else { item->prev=item->next=NULL; plCurrent=plList=item; } |
6713 | 847 list(); |
848 return NULL; | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
849 case gtkInsertPlItem: // add item into playlist after current |
6713 | 850 if ( plCurrent ) |
851 { | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
852 plItem * curr = plCurrent; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
853 item->next=curr->next; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
854 if (item->next) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
855 item->next->prev=item; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
856 item->prev=curr; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
857 curr->next=item; |
6713 | 858 plCurrent=plCurrent->next; |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
859 return plCurrent; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
860 } |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
861 else |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
862 return gtkSet(gtkAddPlItem,0,(void*)item); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
863 return NULL; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
864 case gtkGetNextPlItem: // get current item from playlist |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
865 if ( plCurrent && plCurrent->next) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
866 { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
867 plCurrent=plCurrent->next; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
868 /*if ( !plCurrent && plList ) |
6713 | 869 { |
870 plItem * next = plList; | |
871 while ( next->next ) { if ( !next->next ) break; next=next->next; } | |
872 plCurrent=next; | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
873 }*/ |
6713 | 874 return plCurrent; |
875 } | |
876 return NULL; | |
877 case gtkGetPrevPlItem: | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
878 if ( plCurrent && plCurrent->prev) |
6713 | 879 { |
880 plCurrent=plCurrent->prev; | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
881 //if ( !plCurrent && plList ) plCurrent=plList; |
6713 | 882 return plCurrent; |
883 } | |
6794 | 884 return NULL; |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
885 case gtkSetCurrPlItem: // set current item |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
886 plCurrent=item; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
887 return plCurrent; |
6713 | 888 case gtkGetCurrPlItem: // get current item |
889 return plCurrent; | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
890 case gtkDelCurrPlItem: // delete current item |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
891 { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
892 plItem * curr = plCurrent; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
893 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
894 if (!curr) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
895 return NULL; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
896 if (curr->prev) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
897 curr->prev->next=curr->next; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
898 if (curr->next) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
899 curr->next->prev=curr->prev; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
900 if (curr==plList) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
901 plList=curr->next; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
902 plCurrent=curr->next; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
903 // Free it |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
904 if ( curr->path ) free( curr->path ); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
905 if ( curr->name ) free( curr->name ); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
906 free( curr ); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
907 } |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
908 mplCurr(); // Instead of using mplNext && mplPrev |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
909 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
910 return plCurrent; |
6713 | 911 case gtkDelPl: // delete list |
912 { | |
913 plItem * curr = plList; | |
914 plItem * next; | |
915 if ( !plList ) return NULL; | |
916 if ( !curr->next ) | |
917 { | |
918 if ( curr->path ) free( curr->path ); | |
919 if ( curr->name ) free( curr->name ); | |
920 free( curr ); | |
921 } | |
922 else | |
923 { | |
924 while ( curr->next ) | |
925 { | |
926 next=curr->next; | |
927 if ( curr->path ) free( curr->path ); | |
928 if ( curr->name ) free( curr->name ); | |
929 free( curr ); | |
930 curr=next; | |
931 } | |
932 } | |
933 plList=NULL; plCurrent=NULL; | |
934 } | |
935 return NULL; | |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
936 // ----- Handle url |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
937 case gtkAddURLItem: |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
938 if ( URLList ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
939 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
940 URLItem * next_url = URLList; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
941 is_added = False; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
942 while ( next_url->next ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
943 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
944 if ( !gstrcmp( next_url->url,url_item->url ) ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
945 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
946 is_added=True; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
947 break; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
948 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
949 next_url=next_url->next; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
950 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
951 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
|
952 } else { url_item->next=NULL; URLList=url_item; } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
953 return NULL; |
6794 | 954 // --- subtitle |
7139 | 955 #ifndef HAVE_FREETYPE |
6794 | 956 case gtkSetFontFactor: |
7019 | 957 font_factor=fparam; |
6794 | 958 guiLoadFont(); |
959 return NULL; | |
7139 | 960 #else |
961 case gtkSetFontOutLine: | |
962 subtitle_font_thickness=( 8.0f / 100.0f ) * fparam; | |
963 guiLoadFont(); | |
964 return NULL; | |
965 case gtkSetFontBlur: | |
966 subtitle_font_radius=( 8.0f / 100.0f ) * fparam; | |
967 guiLoadFont(); | |
968 return NULL; | |
969 case gtkSetFontTextScale: | |
970 text_font_scale_factor=fparam; | |
971 guiLoadFont(); | |
972 return NULL; | |
973 case gtkSetFontOSDScale: | |
974 osd_font_scale_factor=fparam; | |
975 guiLoadFont(); | |
976 return NULL; | |
977 case gtkSetFontEncoding: | |
9056 | 978 gfree( (void **)&subtitle_font_encoding ); |
7139 | 979 subtitle_font_encoding=gstrdup( (char *)vparam ); |
980 guiLoadFont(); | |
981 return NULL; | |
982 case gtkSetFontAutoScale: | |
983 subtitle_autoscale=(int)fparam; | |
984 guiLoadFont(); | |
985 return NULL; | |
986 #endif | |
9056 | 987 #ifdef USE_ICONV |
988 case gtkSetSubEncoding: | |
989 gfree( (void **)&sub_cp ); | |
990 sub_cp=gstrdup( (char *)vparam ); | |
991 break; | |
6794 | 992 #endif |
993 // --- misc | |
994 case gtkClearStruct: | |
7009 | 995 if ( (unsigned int)vparam & guiFilenames ) |
6794 | 996 { |
997 gfree( (void **)&guiIntfStruct.Filename ); | |
998 gfree( (void **)&guiIntfStruct.Subtitlename ); | |
999 gfree( (void **)&guiIntfStruct.AudioFile ); | |
7009 | 1000 gtkSet( gtkDelPl,0,NULL ); |
6794 | 1001 } |
1002 #ifdef USE_DVDREAD | |
7009 | 1003 if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) ); |
6794 | 1004 #endif |
1005 #ifdef HAVE_VCD | |
7009 | 1006 if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0; |
6794 | 1007 #endif |
1008 return NULL; | |
1009 case gtkSetExtraStereo: | |
1010 gtkAOExtraStereoMul=fparam; | |
1011 audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(int)>kAOExtraStereoMul ); | |
1012 return NULL; | |
1013 case gtkSetPanscan: | |
7217 | 1014 { |
1015 mp_cmd_t * mp_cmd; | |
1016 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) ); | |
1017 mp_cmd->id=MP_CMD_PANSCAN; mp_cmd->name=strdup( "panscan" ); | |
1018 mp_cmd->args[0].v.f=fparam; mp_cmd->args[1].v.i=1; | |
1019 mp_input_queue_cmd( mp_cmd ); | |
1020 } | |
6794 | 1021 return NULL; |
1022 case gtkSetAutoq: | |
7019 | 1023 auto_quality=(int)fparam; |
6794 | 1024 return NULL; |
6713 | 1025 // --- set equalizers |
6627 | 1026 case gtkSetContrast: |
7217 | 1027 if ( guiIntfStruct.sh_video ) set_video_colors( guiIntfStruct.sh_video,"contrast",(int)fparam ); |
1028 return NULL; | |
6627 | 1029 case gtkSetBrightness: |
7217 | 1030 if ( guiIntfStruct.sh_video ) set_video_colors( guiIntfStruct.sh_video,"brightness",(int)fparam ); |
1031 return NULL; | |
6627 | 1032 case gtkSetHue: |
7217 | 1033 if ( guiIntfStruct.sh_video ) set_video_colors( guiIntfStruct.sh_video,"hue",(int)fparam ); |
1034 return NULL; | |
6627 | 1035 case gtkSetSaturation: |
7217 | 1036 if ( guiIntfStruct.sh_video ) set_video_colors( guiIntfStruct.sh_video,"saturation",(int)fparam ); |
1037 return NULL; | |
6627 | 1038 case gtkSetEqualizer: |
1039 if ( eq ) | |
1040 { | |
1041 gtkEquChannels[eq->channel][eq->band]=eq->gain; | |
1042 audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)eq ); | |
1043 } | |
1044 else | |
1045 { | |
1046 int i,j; equalizer_t tmp; tmp.gain=0.0f; | |
1047 memset( gtkEquChannels,0,sizeof( gtkEquChannels ) ); | |
1048 for ( i=0;i<6;i++ ) | |
1049 for ( j=0;j<10;j++ ) | |
1050 { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)&tmp ); } | |
1051 } | |
6713 | 1052 return NULL; |
6627 | 1053 } |
6713 | 1054 return NULL; |
6627 | 1055 } |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1056 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1057 #define mp_basename(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1)) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1058 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1059 #include "../playtree.h" |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1060 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1061 //This function adds/inserts one file into the gui playlist |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1062 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1063 int import_file_into_gui(char* temp, int insert) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1064 { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1065 char *filename, *pathname; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1066 plItem * item; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1067 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1068 filename = strdup(mp_basename(temp)); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1069 pathname = strdup(temp); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1070 if (strlen(pathname)-strlen(filename)>0) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1071 pathname[strlen(pathname)-strlen(filename)-1]='\0'; // We have some path so remove / at end |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1072 else |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1073 pathname[strlen(pathname)-strlen(filename)]='\0'; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1074 mp_msg(MSGT_PLAYTREE,MSGL_V, "Adding filename %s && pathname %s\n",filename,pathname); //FIXME: Change to MSGL_DBG2 ? |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1075 item=calloc( 1,sizeof( plItem ) ); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1076 if (!item) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1077 return 0; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1078 item->name=filename; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1079 item->path=pathname; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1080 if (insert) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1081 gtkSet( gtkInsertPlItem,0,(void*)item ); // Inserts the item after current, and makes current=item |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1082 else |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1083 gtkSet( gtkAddPlItem,0,(void*)item ); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1084 return 1; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1085 } |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1086 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1087 #ifdef NEW_CONFIG |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1088 #include "../m_option.h" |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1089 #include "../m_config.h" |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1090 #else |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1091 #include "../cfgparser.h" |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1092 #endif |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1093 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1094 // This function imports the initial playtree (based on cmd-line files) into the gui playlist |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1095 // by either: |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1096 // - overwriting gui pl (enqueue=0) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1097 // - appending it to gui pl (enqueue=1) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1098 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1099 int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* config, int enqueue) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1100 { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1101 play_tree_iter_t* my_pt_iter=NULL; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1102 int result=0; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1103 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1104 if (!enqueue) // Delete playlist before "appending" |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1105 gtkSet(gtkDelPl,0,0); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1106 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1107 if((my_pt_iter=pt_iter_create(&my_playtree,config))) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1108 { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1109 while ((filename=pt_iter_get_next_file(my_pt_iter))!=NULL) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1110 { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1111 if (import_file_into_gui(filename, 0)) // Add it to end of list |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1112 result=1; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1113 } |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1114 } |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1115 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1116 mplCurr(); // Update filename |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1117 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1118 if (!enqueue) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1119 filename=guiIntfStruct.Filename; // Backward compatibility; if file is specified on commandline, |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1120 // gmplayer does directly start in Play-Mode. |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1121 else |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1122 filename=NULL; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1123 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1124 return result; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1125 } |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1126 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1127 // This function imports and inserts an playtree, that is created "on the fly", for example by |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1128 // parsing some MOV-Reference-File; or by loading an playlist with "File Open" |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1129 // |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1130 // The file which contained the playlist is thereby replaced with it's contents. |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1131 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1132 int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* config) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1133 { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1134 play_tree_iter_t* my_pt_iter=NULL; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1135 int result=0; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1136 plItem * save=(plItem*)gtkSet( gtkGetCurrPlItem, 0, 0); // Save current item |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1137 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1138 if((my_pt_iter=pt_iter_create(&my_playtree,config))) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1139 { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1140 while ((filename=pt_iter_get_next_file(my_pt_iter))!=NULL) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1141 { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1142 if (import_file_into_gui(filename, 1)) // insert it into the list and set plCurrent=new item |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1143 result=1; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1144 } |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1145 pt_iter_destroy(&my_pt_iter); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1146 } |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1147 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1148 if (save) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1149 gtkSet(gtkSetCurrPlItem, 0, (void*)save); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1150 else |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1151 gtkSet(gtkSetCurrPlItem, 0, (void*)plList); // go to head, if plList was empty before |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1152 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1153 if (save && result) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1154 gtkSet(gtkDelCurrPlItem, 0, 0); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1155 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1156 mplCurr(); // Update filename |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1157 filename=NULL; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1158 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1159 return result; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9202
diff
changeset
|
1160 } |