annotate Gui/interface.c @ 12646:9a495bdc3a1e

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