annotate gui/interface.c @ 32734:cc58a1e919d9

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