annotate gui/interface.c @ 30814:9257c04720ed

Avoid duplication of usePal() macro.
author stefano
date Sat, 06 Mar 2010 11:50:54 +0000
parents ebe42a93c6c3
children 76a13038105e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26458
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
1 /*
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
2 * This file is part of MPlayer.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
3 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
5 * it under the terms of the GNU General Public License as published by
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
7 * (at your option) any later version.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
8 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
12 * GNU General Public License for more details.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
13 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
14 * You should have received a copy of the GNU General Public License along
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 25851
diff changeset
17 */
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
18
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
19 #include <inttypes.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
20 #include <stdlib.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
21 #include <stdio.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
22 #include <string.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
23 #include <sys/types.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
24
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
25 #include "wm/ws.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
26 #include "wm/wsxdnd.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
27 #include "interface.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
28 #include "skin/skin.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
29
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
30 #include "mplayer/gtk/eq.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
31 #include "mplayer/widgets.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
32 #include "mplayer/gmplayer.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
33 #include "mplayer/play.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
34
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
35 #include "access_mpcontext.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
36 #include "app.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
37 #include "cfg.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
38 #include "help_mp.h"
24242
76f5d8892c04 Clean up the way get_path is handled: Compile get_path.c to an object to link
diego
parents: 24153
diff changeset
39 #include "get_path.h"
30516
f4e017b6921a Fix exit_player() usage throughout the codebase.
diego
parents: 30063
diff changeset
40 #include "mp_core.h"
30536
39a4dd7ec420 Move GUI-related extern declarations to a GUI header file.
diego
parents: 30535
diff changeset
41 #include "mplayer.h"
30653
3d23e24c5c60 Declare externally used variables from vd.c as extern in vd.h.
diego
parents: 30536
diff changeset
42 #include "libmpcodecs/vd.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
43 #include "libvo/x11_common.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
44 #include "libvo/video_out.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
45 #include "libvo/font_load.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
46 #include "libvo/sub.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
47 #include "input/input.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
48 #include "libao2/audio_out.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
49 #include "mixer.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
50 #include "libaf/af.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
51 #include "libaf/equalizer.h"
24153
0bbfebce0583 Remove redundant extern declarations, #include the right headers instead.
diego
parents: 24149
diff changeset
52 #include "libass/ass_mp.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
53
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
54 extern af_cfg_t af_cfg;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
55
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27390
diff changeset
56 #ifdef CONFIG_ICONV
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
57 #include <iconv.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
58 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
59
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
60 #include "stream/stream.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
61 #include "libmpdemux/demuxer.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
62 #include "libmpdemux/stheader.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
63 #include "libmpcodecs/dec_video.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
64
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
65 #ifdef CONFIG_DVDREAD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
66 #include "stream/stream_dvd.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
67 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
68
23603
c1221a031ab7 Add a (almost correct) prototype for vcd_seek_to_track
reimar
parents: 23341
diff changeset
69 int vcd_seek_to_track(void *vcd, int track);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
70
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
71 #include "m_config.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
72 #include "m_option.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
73
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
74
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
75 guiInterface_t guiIntfStruct;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
76 int guiWinID=-1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
77
30535
016e5fc1dead GUI: Mark functions that are not used outside their files as static.
diego
parents: 30516
diff changeset
78 static char * gstrcat( char ** dest, const char * src )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
79 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
80 char * tmp = NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
81
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
82 if ( !src ) return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
83
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
84 if ( *dest )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
85 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
86 tmp=malloc( strlen( *dest ) + strlen( src ) + 1 );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
87
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
88 if ( tmp ) /* TODO: advanced error handling */
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
89 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
90 strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
91 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
92 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
93 else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
94 { tmp=malloc( strlen( src ) + 1 ); strcpy( tmp,src ); }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
95 *dest=tmp;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
96 return tmp;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
97 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
98
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
99 int gstrcmp( const char * a,const char * b )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
100 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
101 if ( !a && !b ) return 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
102 if ( !a || !b ) return -1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
103 return strcmp( a,b );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
104 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
105
30535
016e5fc1dead GUI: Mark functions that are not used outside their files as static.
diego
parents: 30516
diff changeset
106 static int gstrncmp( const char * a, const char * b, int size )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
107 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
108 if ( !a && !b ) return 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
109 if ( !a || !b ) return -1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
110 return strncmp( a,b,size );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
111 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
112
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
113 char * gstrdup( const char * str )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
114 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
115 if ( !str ) return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
116 return strdup( str );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
117 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
118
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
119 char * gstrchr( char * str,int c )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
120 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
121 if ( !str ) return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
122 return strchr( str,c );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
123 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
124
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
125 void gfree( void ** p )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
126 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
127 if ( *p == NULL ) return;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
128 free( *p ); *p=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
129 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
130
30535
016e5fc1dead GUI: Mark functions that are not used outside their files as static.
diego
parents: 30516
diff changeset
131 static void gset( char ** str, const char * what )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
132 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
133 if ( *str ) { if ( !strstr( *str,what ) ) { gstrcat( str,"," ); gstrcat( str,what ); }}
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
134 else gstrcat( str,what );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
135 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
136
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
137 /**
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
138 * \brief this actually creates a new list containing only one element...
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
139 */
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
140 void gaddlist( char *** list,const char * entry )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
141 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
142 int i;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
143
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
144 if ( (*list) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
145 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
146 for ( i=0;(*list)[i];i++ ) free( (*list)[i] );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
147 free( (*list) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
148 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
149
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
150 (*list)=malloc( 2 * sizeof(char **) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
151 (*list)[0]=gstrdup( entry );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
152 (*list)[1]=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
153 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
154
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
155 /**
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
156 * \brief this replaces a string starting with search by replace.
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
157 * If not found, replace is appended.
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
158 */
30535
016e5fc1dead GUI: Mark functions that are not used outside their files as static.
diego
parents: 30516
diff changeset
159 static void greplace(char ***list, const char *search, const char *replace)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
160 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
161 int i = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
162 int len = (search) ? strlen(search) : 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
163
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
164 if (*list) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
165 for (i = 0; (*list)[i]; i++) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
166 if (search && (strncmp((*list)[i], search, len) == 0)) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
167 free((*list)[i]);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
168 (*list)[i] = gstrdup(replace);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
169 return;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
170 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
171 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
172 *list = realloc(*list, (i + 2) * sizeof(char *));
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
173 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
174 else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
175 *list = malloc(2 * sizeof(char *));
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
176
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
177 (*list)[i] = gstrdup(replace);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
178 (*list)[i + 1] = NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
179 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
180
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
181 void guiInit( void )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
182 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
183 int i;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
184
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
185 memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
186 guiIntfStruct.Balance=50.0f;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
187 guiIntfStruct.StreamType=-1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
188
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
189 memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
190 #ifdef CONFIG_DXR3
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
191 if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
192 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
193 if ( stream_cache_size > 0 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
194 else if ( stream_cache_size == 0 ) gtkCacheOn = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
195 if ( autosync && autosync != gtkAutoSync ) { gtkAutoSyncOn=1; gtkAutoSync=autosync; }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
196
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
197 #ifdef CONFIG_ASS
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
198 gtkASS.enabled = ass_enabled;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
199 gtkASS.use_margins = ass_use_margins;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
200 gtkASS.top_margin = ass_top_margin;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
201 gtkASS.bottom_margin = ass_bottom_margin;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
202 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
203
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
204 gtkInit();
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
205 // --- initialize X
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
206 wsXInit( (void *)mDisplay );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
207 // --- load skin
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
208 skinDirInHome=get_path("skins");
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
209 skinDirInHome_obsolete=get_path("Skin");
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
210 skinMPlayerDir=MPLAYER_DATADIR "/skins";
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
211 skinMPlayerDir_obsolete=MPLAYER_DATADIR "/Skin";
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
212 mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1: '%s'\n",skinDirInHome);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
213 mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1 (obsolete): '%s'\n",skinDirInHome_obsolete);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
214 mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2: '%s'\n",skinMPlayerDir);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
215 mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2 (obsolete): '%s'\n",skinMPlayerDir_obsolete);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
216 if ( !skinName ) skinName=strdup( "default" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
217 i = skinRead( skinName );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
218 if ((i == -1) && strcmp(skinName,"default"))
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
219 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
220 mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_SKIN_SKINCFG_SelectedSkinNotFound, skinName);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
221 skinName=strdup( "default" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
222 i = skinRead( skinName );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
223 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
224 switch (i) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
225 case -1: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinNotFound,skinName ); exit( 0 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
226 case -2: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinCfgReadError,skinName ); exit( 0 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
227 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
228 // --- initialize windows
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
229 if ( ( mplDrawBuffer = malloc( appMPlayer.main.Bitmap.ImageSize ) ) == NULL )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
230 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
231 fprintf( stderr,MSGTR_NEMDB );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
232 exit( 0 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
233 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
234
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
235 if ( gui_save_pos )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
236 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
237 appMPlayer.main.x = gui_main_pos_x;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
238 appMPlayer.main.y = gui_main_pos_y;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
239 appMPlayer.sub.x = gui_sub_pos_x;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
240 appMPlayer.sub.y = gui_sub_pos_y;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
241 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
242
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
243 if (WinID>0)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
244 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
245 appMPlayer.subWindow.Parent=WinID;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
246 appMPlayer.sub.x=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
247 appMPlayer.sub.y=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
248 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
249 if (guiWinID>=0) appMPlayer.mainWindow.Parent=guiWinID;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
250
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
251 wsCreateWindow( &appMPlayer.subWindow,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
252 appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
253 wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsHideWindow,"MPlayer - Video" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
254
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
255 wsDestroyImage( &appMPlayer.subWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
256 wsCreateImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
257 wsXDNDMakeAwareness(&appMPlayer.subWindow);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
258
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
259 mplMenuInit();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
260 mplPBInit();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
261
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
262 vo_setwindow( appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
263
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
264 // i=wsHideFrame|wsMaxSize|wsHideWindow;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
265 // if ( appMPlayer.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
266 i=wsShowFrame|wsMaxSize|wsHideWindow;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
267 wsCreateWindow( &appMPlayer.mainWindow,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
268 appMPlayer.main.x,appMPlayer.main.y,appMPlayer.main.width,appMPlayer.main.height,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
269 wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,i,"MPlayer" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
270
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
271 wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
272 wsXDNDMakeAwareness(&appMPlayer.mainWindow);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
273
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
274 #ifdef DEBUG
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
275 mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] depth on screen: %d\n",wsDepthOnScreen );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
276 mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] parent: 0x%x\n",(int)appMPlayer.mainWindow.WindowID );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
277 mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] sub: 0x%x\n",(int)appMPlayer.subWindow.WindowID );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
278 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
279
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
280 appMPlayer.mainWindow.ReDraw=(void *)mplMainDraw;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
281 appMPlayer.mainWindow.MouseHandler=mplMainMouseHandle;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
282 appMPlayer.mainWindow.KeyHandler=mplMainKeyHandle;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
283 appMPlayer.mainWindow.DandDHandler=mplDandDHandler;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
284
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
285 appMPlayer.subWindow.ReDraw=(void *)mplSubDraw;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
286 appMPlayer.subWindow.MouseHandler=mplSubMouseHandle;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
287 appMPlayer.subWindow.KeyHandler=mplMainKeyHandle;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
288 appMPlayer.subWindow.DandDHandler=mplDandDHandler;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
289
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
290 wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
291 wsClearWindow( appMPlayer.subWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
292 if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
293
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
294 btnModify( evSetVolume,guiIntfStruct.Volume );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
295 btnModify( evSetBalance,guiIntfStruct.Balance );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
296 btnModify( evSetMoviePosition,guiIntfStruct.Position );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
297
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
298 wsSetIcon( wsDisplay,appMPlayer.mainWindow.WindowID,guiIcon,guiIconMask );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
299 wsSetIcon( wsDisplay,appMPlayer.subWindow.WindowID,guiIcon,guiIconMask );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
300
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
301 guiIntfStruct.Playing=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
302
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
303 if ( !appMPlayer.mainDecoration ) wsWindowDecoration( &appMPlayer.mainWindow,0 );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
304
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
305 wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
306 #if 0
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
307 wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
308
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
309 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
310 XEvent xev;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
311 do { XNextEvent( wsDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != appMPlayer.subWindow.WindowID );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
312 appMPlayer.subWindow.Mapped=wsMapped;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
313 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
314
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
315 if ( !fullscreen ) fullscreen=gtkLoadFullscreen;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
316 if ( fullscreen )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
317 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
318 mplFullScreen();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
319 btnModify( evFullScreen,btnPressed );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
320 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
321 #else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
322 if ( !fullscreen ) fullscreen=gtkLoadFullscreen;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
323 if ( gtkShowVideoWindow )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
324 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
325 wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
326 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
327 XEvent xev;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
328 do { XNextEvent( wsDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != appMPlayer.subWindow.WindowID );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
329 appMPlayer.subWindow.Mapped=wsMapped;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
330 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
331
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
332 if ( fullscreen )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
333 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
334 mplFullScreen();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
335 btnModify( evFullScreen,btnPressed );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
336 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
337 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
338 else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
339 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
340 if ( fullscreen )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
341 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
342 wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
343 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
344 XEvent xev;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
345 do { XNextEvent( wsDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != appMPlayer.subWindow.WindowID );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
346 appMPlayer.subWindow.Mapped=wsMapped;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
347 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
348 wsVisibleWindow( &appMPlayer.subWindow, wsShowWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
349
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
350 mplFullScreen();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
351 btnModify( evFullScreen,btnPressed );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
352 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
353 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
354 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
355 mplSubRender=1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
356 // ---
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
357
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
358 if ( filename ) mplSetFileName( NULL,filename,STREAMTYPE_FILE );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
359 if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
360 if ( subdata ) guiSetFilename( guiIntfStruct.Subtitlename, subdata->filename );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
361 guiLoadFont();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
362 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
363
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
364 void guiDone( void )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
365 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
366 mplMainRender=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
367 mp_msg( MSGT_GPLAYER,MSGL_V,"[GUI] done.\n" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
368
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
369 if ( gui_save_pos )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
370 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
371 gui_main_pos_x=appMPlayer.mainWindow.X; gui_main_pos_y=appMPlayer.mainWindow.Y;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
372 gui_sub_pos_x=appMPlayer.subWindow.X; gui_sub_pos_y=appMPlayer.subWindow.Y;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
373 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
374
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
375 #ifdef CONFIG_ASS
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
376 ass_enabled = gtkASS.enabled;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
377 ass_use_margins = gtkASS.use_margins;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
378 ass_top_margin = gtkASS.top_margin;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
379 ass_bottom_margin = gtkASS.bottom_margin;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
380 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
381
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
382 cfg_write();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
383 wsXDone();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
384 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
385
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
386 int guiCMDArray[] =
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
387 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
388 evLoadPlay,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
389 evLoadSubtitle,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
390 evAbout,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
391 evPlay,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
392 evStop,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
393 evPlayList,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
394 evPreferences,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
395 evFullScreen,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
396 evSkinBrowser
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
397 };
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
398
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
399 extern int stream_dump_type;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
400 extern int vcd_track;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
401 extern m_obj_settings_t * vf_settings;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
402
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
403 void guiLoadFont( void )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
404 {
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27390
diff changeset
405 #ifdef CONFIG_FREETYPE
25851
9ebd00825df2 Allow independent scaling of vo_font and sub_font.
reimar
parents: 25765
diff changeset
406 load_font_ft(vo_image_width, vo_image_height, &vo_font, font_name, osd_font_scale_factor);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
407 #else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
408 if ( vo_font )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
409 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
410 int i;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
411 if ( vo_font->name ) free( vo_font->name );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
412 if ( vo_font->fpath ) free( vo_font->fpath );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
413 for ( i=0;i<16;i++ )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
414 if ( vo_font->pic_a[i] )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
415 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
416 if ( vo_font->pic_a[i]->bmp ) free( vo_font->pic_a[i]->bmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
417 if ( vo_font->pic_a[i]->pal ) free( vo_font->pic_a[i]->pal );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
418 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
419 for ( i=0;i<16;i++ )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
420 if ( vo_font->pic_b[i] )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
421 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
422 if ( vo_font->pic_b[i]->bmp ) free( vo_font->pic_b[i]->bmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
423 if ( vo_font->pic_b[i]->pal ) free( vo_font->pic_b[i]->pal );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
424 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
425 free( vo_font ); vo_font=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
426 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
427 if ( font_name )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
428 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
429 vo_font=read_font_desc( font_name,font_factor,0 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
430 if ( !vo_font ) mp_msg( MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
431 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
432 else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
433 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
434 font_name=gstrdup( get_path( "font/font.desc" ) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
435 vo_font=read_font_desc( font_name,font_factor,0 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
436 if ( !vo_font )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
437 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
438 gfree( (void **)&font_name ); font_name=gstrdup(MPLAYER_DATADIR "/font/font.desc" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
439 vo_font=read_font_desc( font_name,font_factor,0 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
440 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
441 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
442 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
443 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
444
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
445 extern mp_osd_obj_t* vo_osd_list;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
446
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
447 extern char **sub_name;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
448
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
449 void guiLoadSubtitle( char * name )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
450 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
451 if ( guiIntfStruct.Playing == 0 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
452 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
453 guiIntfStruct.SubtitleChanged=1; //what is this for? (mw)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
454 return;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
455 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
456 if ( subdata )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
457 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
458 mp_msg( MSGT_GPLAYER,MSGL_INFO,MSGTR_DeletingSubtitles );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
459 sub_free( subdata );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
460 subdata=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
461 vo_sub=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
462 if ( vo_osd_list )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
463 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
464 int len;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
465 mp_osd_obj_t * osd = vo_osd_list;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
466 while ( osd )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
467 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
468 if ( osd->type == OSDTYPE_SUBTITLE ) break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
469 osd=osd->next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
470 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
471 if ( osd && osd->flags&OSDFLAG_VISIBLE )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
472 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
473 len=osd->stride * ( osd->bbox.y2 - osd->bbox.y1 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
474 memset( osd->bitmap_buffer,0,len );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
475 memset( osd->alpha_buffer,0,len );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
476 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
477 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
478 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
479 if ( name )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
480 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
481 mp_msg( MSGT_GPLAYER,MSGL_INFO,MSGTR_LoadingSubtitles,name );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
482 subdata=sub_read_file( name, guiIntfStruct.FPS );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
483 if ( !subdata ) mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_CantLoadSub,name );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
484 sub_name = (malloc(2 * sizeof(char*))); //when mplayer will be restarted
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
485 sub_name[0] = strdup(name); //sub_name[0] will be read
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
486 sub_name[1] = NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
487 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
488 update_set_of_subtitles();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
489
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
490 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
491
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
492 static void add_vf( char * str )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
493 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
494 mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_AddingVideoFilter,str );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
495 if ( vf_settings )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
496 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
497 int i = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
498 while ( vf_settings[i].name ) if ( !gstrcmp( vf_settings[i++].name,str ) ) { i=-1; break; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
499 if ( i != -1 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
500 { vf_settings=realloc( vf_settings,( i + 2 ) * sizeof( m_obj_settings_t ) ); vf_settings[i].name=strdup( str );vf_settings[i].attribs = NULL; vf_settings[i+1].name=NULL; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
501 } else { vf_settings=malloc( 2 * sizeof( m_obj_settings_t ) ); vf_settings[0].name=strdup( str );vf_settings[0].attribs = NULL; vf_settings[1].name=NULL; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
502 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
503
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
504 static void remove_vf( char * str )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
505 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
506 int n = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
507
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
508 if ( !vf_settings ) return;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
509
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
510 mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_RemovingVideoFilter,str );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
511
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
512 while ( vf_settings[n++].name ); n--;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
513 if ( n > -1 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
514 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
515 int i = 0,m = -1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
516 while ( vf_settings[i].name ) if ( !gstrcmp( vf_settings[i++].name,str ) ) { m=i - 1; break; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
517 i--;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
518 if ( m > -1 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
519 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
520 if ( n == 1 ) { free( vf_settings[0].name );free( vf_settings[0].attribs ); free( vf_settings ); vf_settings=NULL; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
521 else { free( vf_settings[i].name );free( vf_settings[i].attribs ); memcpy( &vf_settings[i],&vf_settings[i + 1],( n - i ) * sizeof( m_obj_settings_t ) ); }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
522 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
523 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
524 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
525
30689
ebe42a93c6c3 Fix silly type of guiGetEvent argument to use void * instead of char * and
reimar
parents: 30653
diff changeset
526 int guiGetEvent( int type,void * arg )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
527 {
25765
304fc0bbefe1 audio_out / video_out structs should be treated as const
reimar
parents: 25219
diff changeset
528 const ao_functions_t *audio_out = NULL;
25219
e82ecde2cbd4 Mark several uses of vo_functions_t as const to stop some of the current
reimar
parents: 24242
diff changeset
529 const vo_functions_t *video_out = NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
530 mixer_t *mixer = NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
531
30689
ebe42a93c6c3 Fix silly type of guiGetEvent argument to use void * instead of char * and
reimar
parents: 30653
diff changeset
532 stream_t * stream = arg;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
533 #ifdef CONFIG_DVDREAD
30689
ebe42a93c6c3 Fix silly type of guiGetEvent argument to use void * instead of char * and
reimar
parents: 30653
diff changeset
534 dvd_priv_t * dvdp = arg;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
535 #endif
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
536
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
537 if (guiIntfStruct.mpcontext) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
538 audio_out = mpctx_get_audio_out(guiIntfStruct.mpcontext);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
539 video_out = mpctx_get_video_out(guiIntfStruct.mpcontext);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
540 mixer = mpctx_get_mixer(guiIntfStruct.mpcontext);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
541 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
542
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
543 switch ( type )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
544 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
545 case guiXEvent:
30689
ebe42a93c6c3 Fix silly type of guiGetEvent argument to use void * instead of char * and
reimar
parents: 30653
diff changeset
546 guiIntfStruct.event_struct=arg;
ebe42a93c6c3 Fix silly type of guiGetEvent argument to use void * instead of char * and
reimar
parents: 30653
diff changeset
547 wsEvents( wsDisplay,arg,NULL );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
548 gtkEventHandling();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
549 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
550 case guiCEvent:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
551 switch ( (int)arg )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
552 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
553 case guiSetPlay:
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
554 guiIntfStruct.Playing=1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
555 // if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
556 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
557 case guiSetStop:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
558 guiIntfStruct.Playing=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
559 // if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
560 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
561 case guiSetPause: guiIntfStruct.Playing=2; break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
562 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
563 mplState();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
564 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
565 case guiSetState:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
566 mplState();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
567 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
568 case guiSetFileName:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
569 if ( arg ) guiSetFilename( guiIntfStruct.Filename,arg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
570 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
571 case guiSetAudioOnly:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
572 guiIntfStruct.AudioOnly=(int)arg;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
573 if ( (int)arg ) { guiIntfStruct.NoWindow=True; wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
574 else wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
575 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
576 case guiSetContext:
30689
ebe42a93c6c3 Fix silly type of guiGetEvent argument to use void * instead of char * and
reimar
parents: 30653
diff changeset
577 guiIntfStruct.mpcontext=arg;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
578 case guiSetDemuxer:
30689
ebe42a93c6c3 Fix silly type of guiGetEvent argument to use void * instead of char * and
reimar
parents: 30653
diff changeset
579 guiIntfStruct.demuxer=arg;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
580 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
581 case guiSetAfilter:
30689
ebe42a93c6c3 Fix silly type of guiGetEvent argument to use void * instead of char * and
reimar
parents: 30653
diff changeset
582 guiIntfStruct.afilter=arg;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
583 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
584 case guiSetShVideo:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
585 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
586 if ( !appMPlayer.subWindow.isFullScreen )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
587 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
588 wsResizeWindow( &appMPlayer.subWindow,vo_dwidth,vo_dheight );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
589 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
590 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
591 guiIntfStruct.MovieWidth=vo_dwidth;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
592 guiIntfStruct.MovieHeight=vo_dheight;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
593 if (guiWinID>=0)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
594 wsMoveWindow( &appMPlayer.mainWindow,0,0, vo_dheight);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
595 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
596 break;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
597 #ifdef CONFIG_DVDREAD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
598 case guiSetDVD:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
599 guiIntfStruct.DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
600 guiIntfStruct.DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
601 guiIntfStruct.DVD.angles=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
602 guiIntfStruct.DVD.nr_of_audio_channels=dvdp->nr_of_channels;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
603 memcpy( guiIntfStruct.DVD.audio_streams,dvdp->audio_streams,sizeof( dvdp->audio_streams ) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
604 guiIntfStruct.DVD.nr_of_subtitles=dvdp->nr_of_subtitles;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
605 memcpy( guiIntfStruct.DVD.subtitles,dvdp->subtitles,sizeof( dvdp->subtitles ) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
606 guiIntfStruct.DVD.current_title=dvd_title + 1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
607 guiIntfStruct.DVD.current_chapter=dvd_chapter + 1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
608 guiIntfStruct.DVD.current_angle=dvd_angle + 1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
609 guiIntfStruct.Track=dvd_title + 1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
610 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
611 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
612 case guiSetStream:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
613 guiIntfStruct.StreamType=stream->type;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
614 switch( stream->type )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
615 {
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
616 #ifdef CONFIG_DVDREAD
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
617 case STREAMTYPE_DVD:
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
618 guiGetEvent( guiSetDVD,(char *)stream->priv );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
619 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
620 #endif
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
621 #ifdef CONFIG_VCD
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
622 case STREAMTYPE_VCD:
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
623 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
624 int i;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
625
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
626 if (!stream->priv)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
627 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
628 guiIntfStruct.VCDTracks=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
629 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
630 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
631 for ( i=1;i < 100;i++ )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
632 if ( vcd_seek_to_track( stream->priv,i ) < 0 ) break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
633 vcd_seek_to_track( stream->priv,vcd_track );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
634 guiIntfStruct.VCDTracks=--i;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
635 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
636 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
637 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
638 default: break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
639 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
640 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
641 case guiIEvent:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
642 mp_msg( MSGT_GPLAYER,MSGL_V,"cmd: %d\n",(int)arg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
643 switch( (int)arg )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
644 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
645 case MP_CMD_QUIT:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
646 mplEventHandling( evExit,0 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
647 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
648 case MP_CMD_VO_FULLSCREEN:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
649 mplEventHandling( evFullScreen,0 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
650 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
651 default:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
652 mplEventHandling( guiCMDArray[ (int)arg - MP_CMD_GUI_EVENTS - 1 ],0 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
653 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
654 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
655 case guiReDraw:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
656 mplEventHandling( evRedraw,0 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
657 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
658 case guiSetVolume:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
659 if ( audio_out )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
660 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
661 float l,r;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
662 mixer_getvolume( mixer,&l,&r );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
663 guiIntfStruct.Volume=(r>l?r:l);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
664 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
665 else guiIntfStruct.Balance=50.0f;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
666 btnModify( evSetVolume,guiIntfStruct.Volume );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
667 btnModify( evSetBalance,guiIntfStruct.Balance );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
668 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
669 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
670 case guiSetFileFormat:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
671 guiIntfStruct.FileFormat=(int)arg;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
672 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
673 case guiSetValues:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
674 // -- video
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
675 guiIntfStruct.sh_video=arg;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
676 if ( arg )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
677 {
30689
ebe42a93c6c3 Fix silly type of guiGetEvent argument to use void * instead of char * and
reimar
parents: 30653
diff changeset
678 sh_video_t * sh = arg;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
679 guiIntfStruct.FPS=sh->fps;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
680 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
681
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
682 if ( guiIntfStruct.NoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
683
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
684 if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM ) btnSet( evSetMoviePosition,btnDisabled );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
685 else btnSet( evSetMoviePosition,btnReleased );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
686
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
687 // -- audio
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
688 if ( audio_out )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
689 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
690 float l,r;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
691 mixer_getvolume( mixer,&l,&r );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
692 guiIntfStruct.Volume=(r>l?r:l);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
693 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
694 else guiIntfStruct.Balance=50.0f;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
695 btnModify( evSetVolume,guiIntfStruct.Volume );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
696 btnModify( evSetBalance,guiIntfStruct.Balance );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
697 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
698
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
699 if ( gtkEnableAudioEqualizer )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
700 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
701 equalizer_t eq;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
702 int i,j;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
703 for ( i=0;i<6;i++ )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
704 for ( j=0;j<10;j++ )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
705 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
706 eq.channel=i; eq.band=j; eq.gain=gtkEquChannels[i][j];
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
707 gtkSet( gtkSetEqualizer,0,&eq );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
708 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
709 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
710 // -- subtitle
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
711 #ifdef CONFIG_DXR3
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
712 if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
713 #ifdef CONFIG_LIBAVCODEC
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
714 && !gtkVfLAVC
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
715 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
716 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
717 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
718 gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVC );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
719 guiIntfStruct.Playing=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
720 return True;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
721 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
722 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
723 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
724 case guiSetDefaults:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
725 // if ( guiIntfStruct.Playing == 1 && guiIntfStruct.FilenameChanged )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
726 if ( guiIntfStruct.FilenameChanged )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
727 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
728 audio_id=-1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
729 video_id=-1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
730 dvdsub_id=-1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
731 vobsub_id=-1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
732 stream_cache_size=-1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
733 autosync=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
734 vcd_track=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
735 dvd_title=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
736 force_fps=0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
737 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
738 guiIntfStruct.demuxer=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
739 guiIntfStruct.sh_video=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
740 wsPostRedisplay( &appMPlayer.subWindow );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
741 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
742 case guiSetParameters:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
743 guiGetEvent( guiSetDefaults,NULL );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
744 switch ( guiIntfStruct.StreamType )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
745 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
746 case STREAMTYPE_PLAYLIST:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
747 break;
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
748 #ifdef CONFIG_VCD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
749 case STREAMTYPE_VCD:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
750 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
751 char tmp[512];
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
752 sprintf( tmp,"vcd://%d",guiIntfStruct.Track + 1 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
753 guiSetFilename( guiIntfStruct.Filename,tmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
754 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
755 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
756 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
757 #ifdef CONFIG_DVDREAD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
758 case STREAMTYPE_DVD:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
759 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
760 char tmp[512];
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
761 sprintf( tmp,"dvd://%d",guiIntfStruct.Title );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
762 guiSetFilename( guiIntfStruct.Filename,tmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
763 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
764 dvd_chapter=guiIntfStruct.Chapter;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
765 dvd_angle=guiIntfStruct.Angle;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
766 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
767 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
768 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
769 //if ( guiIntfStruct.StreamType != STREAMTYPE_PLAYLIST ) // Does not make problems anymore!
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
770 {
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
771 if ( guiIntfStruct.Filename ) filename=gstrdup( guiIntfStruct.Filename );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
772 else if ( filename ) guiSetFilename( guiIntfStruct.Filename,filename );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
773 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
774 // --- video opts
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
775
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
776 if ( !video_driver_list )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
777 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
778 int i = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
779 while ( video_out_drivers[i++] )
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
780 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
781 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
782 gaddlist( &video_driver_list,(char *)video_out_drivers[i - 1]->info->short_name );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
783 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
784 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
785 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
786
30516
f4e017b6921a Fix exit_player() usage throughout the codebase.
diego
parents: 30063
diff changeset
787 if ( !video_driver_list && !video_driver_list[0] ) { gtkMessageBox( GTK_MB_FATAL,MSGTR_IDFGCVD ); exit_player(EXIT_ERROR); }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
788
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
789 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
790 int i = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
791 guiIntfStruct.NoWindow=False;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
792 while ( video_out_drivers[i++] )
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
793 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
794 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
795 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 ) )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
796 { guiIntfStruct.NoWindow=True; break; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
797 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
798 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
799
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
800 #ifdef CONFIG_DXR3
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
801 #ifdef CONFIG_LIBAVCODEC
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
802 remove_vf( "lavc" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
803 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
804 if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
805 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
806 if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
807 {
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
808 #ifdef CONFIG_LIBAVCODEC
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
809 if ( gtkVfLAVC ) add_vf( "lavc" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
810 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
811 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
812 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
813 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
814 // ---
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
815 if ( gtkVfPP ) add_vf( "pp" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
816 else remove_vf( "pp" );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
817
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
818 // --- audio opts
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
819 // if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
820 if (gtkAONorm)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
821 greplace(&af_cfg.list, "volnorm", "volnorm");
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
822 if (gtkEnableAudioEqualizer)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
823 greplace(&af_cfg.list, "equalizer", "equalizer");
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
824 if ( gtkAOExtraStereo )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
825 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
826 char *name = malloc(12 + 20 + 1);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
827 snprintf(name, 12 + 20, "extrastereo=%f", gtkAOExtraStereoMul);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
828 name[12 + 20] = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
829 greplace(&af_cfg.list, "extrastereo", name);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
830 free(name);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
831 }
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
832 #ifdef CONFIG_OSS_AUDIO
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
833 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"oss",3 ) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
834 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
835 char *tmp;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
836 mixer_device = gtkAOOSSMixer;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
837 mixer_channel = gtkAOOSSMixerChannel;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
838 if (gtkAOOSSDevice) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
839 tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 7 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
840 sprintf( tmp,"oss:%s",gtkAOOSSDevice );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
841 } else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
842 tmp = strdup("oss");
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
843 gaddlist( &audio_driver_list,tmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
844 free(tmp);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
845 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
846 #endif
27390
9d95dc936e66 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
diego
parents: 27387
diff changeset
847 #ifdef CONFIG_ALSA
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
848 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"alsa",4 ) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
849 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
850 char *tmp;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
851 mixer_device = gtkAOALSAMixer;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
852 mixer_channel = gtkAOALSAMixerChannel;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
853 if (gtkAOALSADevice) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
854 tmp = calloc( 1,strlen( gtkAOALSADevice ) + 14 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
855 sprintf( tmp,"alsa:device=%s",gtkAOALSADevice );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
856 } else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
857 tmp = strdup("alsa");
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
858 gaddlist( &audio_driver_list,tmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
859 free(tmp);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
860 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
861 #endif
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
862 #ifdef CONFIG_SDL
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
863 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
864 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
865 char *tmp;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
866 if (gtkAOSDLDriver) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
867 tmp = calloc( 1,strlen( gtkAOSDLDriver ) + 10 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
868 sprintf( tmp,"sdl:%s",gtkAOSDLDriver );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
869 } else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
870 tmp = strdup("sdl");
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
871 gaddlist( &audio_driver_list,tmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
872 free(tmp);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
873 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
874 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
875 #ifdef CONFIG_ESD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
876 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"esd",3 ) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
877 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
878 char *tmp;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
879 if (gtkAOESDDevice) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
880 tmp = calloc( 1,strlen( gtkAOESDDevice ) + 10 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
881 sprintf( tmp,"esd:%s",gtkAOESDDevice );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
882 } else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
883 tmp = strdup("esd");
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
884 gaddlist( &audio_driver_list,tmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
885 free(tmp);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
886 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
887 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
888 // -- subtitle
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
889 //subdata->filename=gstrdup( guiIntfStruct.Subtitlename );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
890 stream_dump_type=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
891 if ( gtkSubDumpMPSub ) stream_dump_type=4;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
892 if ( gtkSubDumpSrt ) stream_dump_type=6;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
893 gtkSubDumpMPSub=gtkSubDumpSrt=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
894 guiLoadFont();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
895
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
896 // --- misc
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
897 if ( gtkCacheOn ) stream_cache_size=gtkCacheSize;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
898 if ( gtkAutoSyncOn ) autosync=gtkAutoSync;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
899
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
900 if ( guiIntfStruct.AudioFile ) audio_stream=gstrdup( guiIntfStruct.AudioFile );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
901 else if ( guiIntfStruct.FilenameChanged ) gfree( (void**)&audio_stream );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
902 //audio_stream=NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
903
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
904 guiIntfStruct.DiskChanged=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
905 guiIntfStruct.FilenameChanged=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
906 guiIntfStruct.NewPlay=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
907
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
908 #ifdef CONFIG_ASS
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
909 ass_enabled = gtkASS.enabled;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
910 ass_use_margins = gtkASS.use_margins;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
911 ass_top_margin = gtkASS.top_margin;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
912 ass_bottom_margin = gtkASS.bottom_margin;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
913 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
914
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
915 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
916 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
917 return False;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
918 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
919
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
920 void guiEventHandling( void )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
921 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
922 if ( !guiIntfStruct.Playing || guiIntfStruct.NoWindow ) wsHandleEvents();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
923 gtkEventHandling();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
924 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
925
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
926 // ---
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
927
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
928 float gtkEquChannels[6][10];
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
929
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
930 plItem * plCurrent = NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
931 plItem * plList = NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
932 plItem * plLastPlayed = NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
933
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
934 URLItem *URLList = NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
935
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
936 char *fsHistory[fsPersistant_MaxPos] = { NULL,NULL,NULL,NULL,NULL };
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
937
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
938 #if defined( MP_DEBUG ) && 0
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
939 void list( void )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
940 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
941 plItem * next = plList;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
942 printf( "--- list ---\n" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
943 while( next || next->next )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
944 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
945 printf( "item: %s/%s\n",next->path,next->name );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
946 if ( next->next ) next=next->next; else break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
947 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
948 printf( "--- end of list ---\n" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
949 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
950 #else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
951 #define list();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
952 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
953
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
954 void * gtkSet( int cmd,float fparam, void * vparam )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
955 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
956 equalizer_t * eq = (equalizer_t *)vparam;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
957 plItem * item = (plItem *)vparam;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
958
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
959 URLItem * url_item = (URLItem *)vparam;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
960 int is_added = True;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
961
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
962 switch ( cmd )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
963 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
964 // --- handle playlist
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
965 case gtkAddPlItem: // add item to playlist
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
966 if ( plList )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
967 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
968 plItem * next = plList;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
969 while ( next->next ) { /*printf( "%s\n",next->name );*/ next=next->next; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
970 next->next=item; item->prev=next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
971 } else { item->prev=item->next=NULL; plCurrent=plList=item; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
972 list();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
973 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
974 case gtkInsertPlItem: // add item into playlist after current
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
975 if ( plCurrent )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
976 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
977 plItem * curr = plCurrent;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
978 item->next=curr->next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
979 if (item->next)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
980 item->next->prev=item;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
981 item->prev=curr;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
982 curr->next=item;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
983 plCurrent=plCurrent->next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
984 return plCurrent;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
985 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
986 else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
987 return gtkSet(gtkAddPlItem,0,(void*)item);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
988 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
989 case gtkGetNextPlItem: // get current item from playlist
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
990 if ( plCurrent && plCurrent->next)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
991 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
992 plCurrent=plCurrent->next;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
993 /*if ( !plCurrent && plList )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
994 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
995 plItem * next = plList;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
996 while ( next->next ) { if ( !next->next ) break; next=next->next; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
997 plCurrent=next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
998 }*/
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
999 return plCurrent;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1000 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1001 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1002 case gtkGetPrevPlItem:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1003 if ( plCurrent && plCurrent->prev)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1004 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1005 plCurrent=plCurrent->prev;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1006 //if ( !plCurrent && plList ) plCurrent=plList;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1007 return plCurrent;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1008 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1009 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1010 case gtkSetCurrPlItem: // set current item
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1011 plCurrent=item;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1012 return plCurrent;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1013 case gtkGetCurrPlItem: // get current item
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1014 return plCurrent;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1015 case gtkDelCurrPlItem: // delete current item
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1016 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1017 plItem * curr = plCurrent;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1018
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1019 if (!curr)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1020 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1021 if (curr->prev)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1022 curr->prev->next=curr->next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1023 if (curr->next)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1024 curr->next->prev=curr->prev;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1025 if (curr==plList)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1026 plList=curr->next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1027 plCurrent=curr->next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1028 // Free it
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1029 if ( curr->path ) free( curr->path );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1030 if ( curr->name ) free( curr->name );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1031 free( curr );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1032 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1033 mplCurr(); // Instead of using mplNext && mplPrev
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1034
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1035 return plCurrent;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1036 case gtkDelPl: // delete list
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1037 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1038 plItem * curr = plList;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1039 plItem * next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1040 if ( !plList ) return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1041 if ( !curr->next )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1042 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1043 if ( curr->path ) free( curr->path );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1044 if ( curr->name ) free( curr->name );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1045 free( curr );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1046 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1047 else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1048 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1049 while ( curr->next )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1050 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1051 next=curr->next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1052 if ( curr->path ) free( curr->path );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1053 if ( curr->name ) free( curr->name );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1054 free( curr );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1055 curr=next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1056 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1057 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1058 plList=NULL; plCurrent=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1059 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1060 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1061 // ----- Handle url
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1062 case gtkAddURLItem:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1063 if ( URLList )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1064 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1065 URLItem * next_url = URLList;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1066 is_added = False;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1067 while ( next_url->next )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1068 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1069 if ( !gstrcmp( next_url->url,url_item->url ) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1070 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1071 is_added=True;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1072 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1073 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1074 next_url=next_url->next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1075 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1076 if ( ( !is_added )&&( gstrcmp( next_url->url,url_item->url ) ) ) next_url->next=url_item;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1077 } else { url_item->next=NULL; URLList=url_item; }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1078 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1079 // --- subtitle
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27390
diff changeset
1080 #ifndef CONFIG_FREETYPE
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1081 case gtkSetFontFactor:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1082 font_factor=fparam;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1083 guiLoadFont();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1084 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1085 #else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1086 case gtkSetFontOutLine:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1087 subtitle_font_thickness=( 8.0f / 100.0f ) * fparam;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1088 guiLoadFont();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1089 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1090 case gtkSetFontBlur:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1091 subtitle_font_radius=( 8.0f / 100.0f ) * fparam;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1092 guiLoadFont();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1093 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1094 case gtkSetFontTextScale:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1095 text_font_scale_factor=fparam;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1096 guiLoadFont();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1097 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1098 case gtkSetFontOSDScale:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1099 osd_font_scale_factor=fparam;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1100 guiLoadFont();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1101 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1102 case gtkSetFontEncoding:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1103 gfree( (void **)&subtitle_font_encoding );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1104 subtitle_font_encoding=gstrdup( (char *)vparam );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1105 guiLoadFont();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1106 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1107 case gtkSetFontAutoScale:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1108 subtitle_autoscale=(int)fparam;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1109 guiLoadFont();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1110 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1111 #endif
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27390
diff changeset
1112 #ifdef CONFIG_ICONV
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1113 case gtkSetSubEncoding:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1114 gfree( (void **)&sub_cp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1115 sub_cp=gstrdup( (char *)vparam );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1116 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1117 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1118 // --- misc
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1119 case gtkClearStruct:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1120 if ( (unsigned int)vparam & guiFilenames )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1121 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1122 gfree( (void **)&guiIntfStruct.Filename );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1123 gfree( (void **)&guiIntfStruct.Subtitlename );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1124 gfree( (void **)&guiIntfStruct.AudioFile );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1125 gtkSet( gtkDelPl,0,NULL );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1126 }
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
1127 #ifdef CONFIG_DVDREAD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1128 if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1129 #endif
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
1130 #ifdef CONFIG_VCD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1131 if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1132 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1133 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1134 case gtkSetExtraStereo:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1135 gtkAOExtraStereoMul=fparam;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1136 if (guiIntfStruct.afilter)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1137 af_control_any_rev(guiIntfStruct.afilter,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1138 AF_CONTROL_ES_MUL | AF_CONTROL_SET, &gtkAOExtraStereoMul);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1139 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1140 case gtkSetPanscan:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1141 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1142 mp_cmd_t * mp_cmd;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1143 mp_cmd=calloc( 1,sizeof( *mp_cmd ) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1144 mp_cmd->id=MP_CMD_PANSCAN; mp_cmd->name=strdup( "panscan" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1145 mp_cmd->args[0].v.f=fparam; mp_cmd->args[1].v.i=1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1146 mp_input_queue_cmd( mp_cmd );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1147 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1148 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1149 case gtkSetAutoq:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1150 auto_quality=(int)fparam;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1151 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1152 // --- set equalizers
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1153 case gtkSetContrast:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1154 if ( guiIntfStruct.sh_video ) set_video_colors( guiIntfStruct.sh_video,"contrast",(int)fparam );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1155 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1156 case gtkSetBrightness:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1157 if ( guiIntfStruct.sh_video ) set_video_colors( guiIntfStruct.sh_video,"brightness",(int)fparam );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1158 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1159 case gtkSetHue:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1160 if ( guiIntfStruct.sh_video ) set_video_colors( guiIntfStruct.sh_video,"hue",(int)fparam );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1161 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1162 case gtkSetSaturation:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1163 if ( guiIntfStruct.sh_video ) set_video_colors( guiIntfStruct.sh_video,"saturation",(int)fparam );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1164 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1165 case gtkSetEqualizer:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1166 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1167 af_control_ext_t tmp;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1168 if ( eq )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1169 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1170 gtkEquChannels[eq->channel][eq->band]=eq->gain;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1171 tmp.ch = eq->channel;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1172 tmp.arg = gtkEquChannels[eq->channel];
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1173 if (guiIntfStruct.afilter)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1174 af_control_any_rev(guiIntfStruct.afilter,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1175 AF_CONTROL_EQUALIZER_GAIN | AF_CONTROL_SET, &tmp);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1176 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1177 else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1178 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1179 int i;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1180 memset( gtkEquChannels,0,sizeof( gtkEquChannels ) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1181 if (guiIntfStruct.afilter)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1182 for ( i=0;i<6;i++ )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1183 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1184 tmp.ch = i;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1185 tmp.arg = gtkEquChannels[i];
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1186 af_control_any_rev(guiIntfStruct.afilter,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1187 AF_CONTROL_EQUALIZER_GAIN | AF_CONTROL_SET, &tmp);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1188 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1189 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1190 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1191 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1192 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1193 return NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1194 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1195
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1196 #define mp_basename(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1))
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1197
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1198 #include "playtree.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1199
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1200 //This function adds/inserts one file into the gui playlist
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1201
30535
016e5fc1dead GUI: Mark functions that are not used outside their files as static.
diego
parents: 30516
diff changeset
1202 static int import_file_into_gui(char* temp, int insert)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1203 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1204 char *filename, *pathname;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1205 plItem * item;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1206
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1207 filename = strdup(mp_basename(temp));
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1208 pathname = strdup(temp);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1209 if (strlen(pathname)-strlen(filename)>0)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1210 pathname[strlen(pathname)-strlen(filename)-1]='\0'; // We have some path so remove / at end
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1211 else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1212 pathname[strlen(pathname)-strlen(filename)]='\0';
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1213 mp_msg(MSGT_PLAYTREE,MSGL_V, "Adding filename %s && pathname %s\n",filename,pathname); //FIXME: Change to MSGL_DBG2 ?
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1214 item=calloc( 1,sizeof( plItem ) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1215 if (!item)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1216 return 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1217 item->name=filename;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1218 item->path=pathname;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1219 if (insert)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1220 gtkSet( gtkInsertPlItem,0,(void*)item ); // Inserts the item after current, and makes current=item
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1221 else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1222 gtkSet( gtkAddPlItem,0,(void*)item );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1223 return 1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1224 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1225
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1226
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1227 // This function imports the initial playtree (based on cmd-line files) into the gui playlist
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1228 // by either:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1229 // - overwriting gui pl (enqueue=0)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1230 // - appending it to gui pl (enqueue=1)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1231
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1232 int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* config, int enqueue)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1233 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1234 play_tree_iter_t* my_pt_iter=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1235 int result=0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1236
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1237 if (!enqueue) // Delete playlist before "appending"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1238 gtkSet(gtkDelPl,0,0);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1239
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1240 if((my_pt_iter=pt_iter_create(&my_playtree,config)))
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1241 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1242 while ((filename=pt_iter_get_next_file(my_pt_iter))!=NULL)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1243 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1244 if (import_file_into_gui(filename, 0)) // Add it to end of list
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1245 result=1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1246 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1247 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1248
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1249 mplCurr(); // Update filename
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1250 mplGotoTheNext=1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1251
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1252 if (!enqueue)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1253 filename=guiIntfStruct.Filename; // Backward compatibility; if file is specified on commandline,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1254 // gmplayer does directly start in Play-Mode.
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1255 else
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1256 filename=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1257
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1258 return result;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1259 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1260
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1261 // This function imports and inserts an playtree, that is created "on the fly", for example by
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1262 // parsing some MOV-Reference-File; or by loading an playlist with "File Open"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1263 //
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1264 // The file which contained the playlist is thereby replaced with it's contents.
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1265
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1266 int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* config)
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1267 {
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1268 play_tree_iter_t* my_pt_iter=NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1269 int result=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1270 plItem * save=(plItem*)gtkSet( gtkGetCurrPlItem, 0, 0); // Save current item
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1271
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1272 if((my_pt_iter=pt_iter_create(&my_playtree,config)))
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1273 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1274 while ((filename=pt_iter_get_next_file(my_pt_iter))!=NULL)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1275 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1276 if (import_file_into_gui(filename, 1)) // insert it into the list and set plCurrent=new item
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1277 result=1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1278 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1279 pt_iter_destroy(&my_pt_iter);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1280 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1281
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1282 if (save)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1283 gtkSet(gtkSetCurrPlItem, 0, (void*)save);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1284 else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1285 gtkSet(gtkSetCurrPlItem, 0, (void*)plList); // go to head, if plList was empty before
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1286
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1287 if (save && result)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1288 gtkSet(gtkDelCurrPlItem, 0, 0);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1289
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1290 mplCurr(); // Update filename
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1291 filename=NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1292
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1293 return result;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1294 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1295
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1296 // wrapper function for mp_msg to display a message box for errors and warnings.
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1297
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1298 void guiMessageBox(int level, char * str) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1299 switch(level) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1300 case MSGL_FATAL:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1301 gtkMessageBox(GTK_MB_FATAL|GTK_MB_SIMPLE, str);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1302 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1303 case MSGL_ERR:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1304 gtkMessageBox(GTK_MB_ERROR|GTK_MB_SIMPLE, str);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1305 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1306 #if 0
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1307 // WARNING! Do NOT enable this! There are too many non-critical messages with
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1308 // MSGL_WARN, for example: broken SPU packets, codec's bit error messages,
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1309 // etc etc, they should not raise up a new window every time.
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1310 case MSGL_WARN:
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1311 gtkMessageBox(GTK_MB_WARNING|GTK_MB_SIMPLE, str);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1312 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1313 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1314 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1315 }