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