annotate Gui/interface.c @ 20136:61272e6d8f08

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