annotate Gui/interface.c @ 7122:0dc9cb756b68

freetype 2.0/2.1+ support - disabled by default until bugs fixed patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
author arpi
date Wed, 28 Aug 2002 20:52:02 +0000
parents b65b78640d49
children dc48f2130a76
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
1
4845
ed5aa118e142 inttypes.h bug fix. 10l
pontscho
parents: 4818
diff changeset
2 #include <inttypes.h>
ed5aa118e142 inttypes.h bug fix. 10l
pontscho
parents: 4818
diff changeset
3 #include <stdlib.h>
ed5aa118e142 inttypes.h bug fix. 10l
pontscho
parents: 4818
diff changeset
4 #include <stdio.h>
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
5 #include <string.h>
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
6
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
7 #include "ws.h"
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
8 #include "mplayer/play.h"
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
9 #include "interface.h"
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
10 #include "skin/skin.h"
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
11 #include "mplayer/gtk/eq.h"
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
12
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
13 #include "../mplayer.h"
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
14 #include "mplayer/widgets.h"
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
15 #include "mplayer/mplayer.h"
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
16 #include "app.h"
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
17 #include "cfg.h"
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
18 #include "../help_mp.h"
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
19 #include "../subreader.h"
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
20 #include "../libvo/x11_common.h"
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
21 #include "../libvo/video_out.h"
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
22 #include "../libvo/font_load.h"
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
23 #include "../input/input.h"
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
24 #include "../libao2/audio_out.h"
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
25 #include "../mixer.h"
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
26 #include "../libao2/audio_plugin.h"
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
27 #include "../libao2/eq.h"
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
28
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
29 #include <inttypes.h>
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
30 #include <sys/types.h>
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
31
6996
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
32 #ifdef USE_ICONV
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
33 #ifdef __FreeBSD__
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
34 #include <giconv.h>
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
35 #else
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
36 #include <iconv.h>
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
37 #endif
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
38 #endif
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
39
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
40 #include "../libmpdemux/stream.h"
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
41 #include "../libmpdemux/demuxer.h"
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
42
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
43 guiInterface_t guiIntfStruct;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
44
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
45 char * gstrcat( char ** dest,char * src )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
46 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
47 char * tmp = NULL;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
48
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
49 if ( !src ) return NULL;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
50
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
51 if ( *dest )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
52 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
53 tmp=malloc( strlen( *dest ) + strlen( src ) + 1 );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
54 strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
55 }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
56 else
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
57 { tmp=malloc( strlen( src ) + 1 ); strcpy( tmp,src ); }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
58 *dest=tmp;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
59 return tmp;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
60 }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
61
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
62 int gstrcmp( char * a,char * b )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
63 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
64 if ( !a && !b ) return 0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
65 if ( !a || !b ) return -1;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
66 return strcmp( a,b );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
67 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
68
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
69 int gstrncmp( char * a,char * b,int size )
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
70 {
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
71 if ( !a && !b ) return 0;
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
72 if ( !a || !b ) return -1;
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
73 return strncmp( a,b,size );
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
74 }
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
75
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
76 char * gstrdup( char * str )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
77 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
78 if ( !str ) return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
79 return strdup( str );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
80 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
81
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
82 void gfree( void ** p )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
83 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
84 if ( *p == NULL ) return;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
85 free( *p ); *p=NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
86 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
87
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
88 void gset( char ** str,char * what )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
89 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
90 if ( *str ) { if ( !strstr( *str,what ) ) gstrcat( str,"," ); gstrcat( str,what ); }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
91 else gstrcat( str,what );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
92 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
93
6996
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
94 #ifdef USE_ICONV
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
95 char * gconvert_uri_to_filename( char * str )
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
96 {
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
97 iconv_t d;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
98 char * out = strdup( str );
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
99 char * tmp = NULL;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
100 char * ize;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
101 size_t inb,outb;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
102 char * charset = "ISO8859-1";
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
103 char * cs;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
104
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
105 if ( !strchr( str,'%' ) ) return str;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
106
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
107 {
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
108 char * t = calloc( 1,strlen( out ) );
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
109 int i,c = 0;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
110 for ( i=0;i < (int)strlen( out );i++ )
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
111 if ( out[i] != '%' ) t[c++]=out[i];
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
112 else
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
113 {
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
114 char tmp[4] = "0xXX";
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
115 // if ( out[++i] == '%' ) { t[c++]='%'; continue; };
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
116 tmp[2]=out[++i]; tmp[3]=out[++i];
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
117 t[c++]=(char)strtol( tmp,(char **)NULL,0 );
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
118 }
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
119 free( out );
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
120 out=t;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
121 }
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
122
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
123 if ( (cs=getenv( "CHARSET" )) && *cs ) charset=cs;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
124
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
125 inb=outb=strlen( out );
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
126 tmp=calloc( 1,outb + 1 );
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
127 ize=tmp;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
128 d=iconv_open( charset,"UTF-8" );
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
129 if ( (iconv_t)(-1) == d ) return str;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
130 iconv( d,&out,&inb,&tmp,&outb );
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
131 iconv_close( d );
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
132 free( out );
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
133 return ize;
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
134 }
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
135 #endif
163f78ece9c2 add uri2filename converter
pontscho
parents: 6973
diff changeset
136
6218
8cfddba867b4 fix text render chrash ...
pontscho
parents: 5997
diff changeset
137 void guiInit( void )
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
138 {
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
139 memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) );
6898
138a7ff52a26 - fix fuckin' locale (?:)
pontscho
parents: 6891
diff changeset
140 guiIntfStruct.Balance=50.0f;
138a7ff52a26 - fix fuckin' locale (?:)
pontscho
parents: 6891
diff changeset
141 guiIntfStruct.StreamType=-1;
138a7ff52a26 - fix fuckin' locale (?:)
pontscho
parents: 6891
diff changeset
142
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
143 memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
144 gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
145 gtkAOOSSDevice=strdup( PATH_DEV_DSP );
6898
138a7ff52a26 - fix fuckin' locale (?:)
pontscho
parents: 6891
diff changeset
146
138a7ff52a26 - fix fuckin' locale (?:)
pontscho
parents: 6891
diff changeset
147 gtkInit();
6912
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
148 wsXInit( (void *)mDisplay );
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
149
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
150 // cfg_read();
6218
8cfddba867b4 fix text render chrash ...
pontscho
parents: 5997
diff changeset
151 appInit( (void*)mDisplay );
6898
138a7ff52a26 - fix fuckin' locale (?:)
pontscho
parents: 6891
diff changeset
152
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
153 if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE );
6973
8cc27ab533b2 fix -sub
pontscho
parents: 6968
diff changeset
154 if ( sub_name ) guiSetFilename( guiIntfStruct.Subtitlename,sub_name );
6797
06d29dbdf20d upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents: 6794
diff changeset
155 #if defined( USE_OSD ) || defined( USE_SUB )
06d29dbdf20d upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents: 6794
diff changeset
156 guiLoadFont();
06d29dbdf20d upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents: 6794
diff changeset
157 #endif
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
158 }
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
159
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
160 void guiDone( void )
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
161 {
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
162 mp_msg( MSGT_GPLAYER,MSGL_V,"[mplayer] exit.\n" );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
163 cfg_write();
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
164 gtkDone();
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
165 wsXDone();
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
166 }
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
167
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
168 int guiCMDArray[] =
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
169 {
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
170 evLoad,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
171 evLoadSubtitle,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
172 evAbout,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
173 evPlay,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
174 evStop,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
175 evPlayList,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
176 evPreferences,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
177 evFullScreen,
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
178 evSkinBrowser
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
179 };
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
180
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
181 typedef struct
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
182 {
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
183 demux_stream_t *ds;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
184 unsigned int format;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
185 struct codecs_st *codec;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
186 int inited;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
187 // output format:
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
188 float timer;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
189 float fps;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
190 float frametime;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
191 int i_bps;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
192 int disp_w,disp_h;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
193 } tmp_sh_video_t;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
194
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
195 extern ao_functions_t * audio_out;
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
196 extern vo_functions_t * video_out;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
197 extern int frame_dropping;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
198 extern int stream_dump_type;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
199 extern char ** vo_plugin_args;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
200
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
201 #if defined( USE_OSD ) || defined( USE_SUB )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
202 void guiLoadFont( void )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
203 {
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
204 #ifdef HAVE_FREETYPE
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
205 load_font(vo_image_width, vo_image_height);
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
206 #else
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
207 if ( vo_font )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
208 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
209 int i;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
210 if ( vo_font->name ) free( vo_font->name );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
211 if ( vo_font->fpath ) free( vo_font->fpath );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
212 for ( i=0;i<16;i++ )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
213 if ( vo_font->pic_a[i] )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
214 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
215 if ( vo_font->pic_a[i]->bmp ) free( vo_font->pic_a[i]->bmp );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
216 if ( vo_font->pic_a[i]->pal ) free( vo_font->pic_a[i]->pal );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
217 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
218 for ( i=0;i<16;i++ )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
219 if ( vo_font->pic_b[i] )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
220 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
221 if ( vo_font->pic_b[i]->bmp ) free( vo_font->pic_b[i]->bmp );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
222 if ( vo_font->pic_b[i]->pal ) free( vo_font->pic_b[i]->pal );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
223 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
224 free( vo_font ); vo_font=NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
225 }
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
226 if ( font_name )
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
227 {
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
228 vo_font=read_font_desc( font_name,font_factor,0 );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
229 if ( !vo_font ) mp_msg( MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
230 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
231 else
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
232 {
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
233 font_name=gstrdup( get_path( "font/font.desc" ) );
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
234 vo_font=read_font_desc( font_name,font_factor,0 );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
235 if ( !vo_font )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
236 {
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
237 gfree( (void **)&font_name ); font_name=gstrdup( DATADIR"/font/font.desc" );
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
238 vo_font=read_font_desc( font_name,font_factor,0 );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
239 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
240 }
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
241 #endif
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
242 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
243 #endif
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
244
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
245 static void add_vop( char * str )
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
246 {
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
247 mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] add video filter: %s\n",str );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
248 if ( vo_plugin_args )
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
249 {
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
250 int i = 0;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
251 while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],str ) ) { i=-1; break; }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
252 if ( i != -1 )
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
253 { vo_plugin_args=realloc( vo_plugin_args,( i + 2 ) * sizeof( char * ) ); vo_plugin_args[i]=strdup( str ); vo_plugin_args[i+1]=NULL; }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
254 } else { vo_plugin_args=malloc( 2 * sizeof( char * ) ); vo_plugin_args[0]=strdup( str ); vo_plugin_args[1]=NULL; }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
255 }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
256
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
257 static void remove_vop( char * str )
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
258 {
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
259 int n = 0;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
260
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
261 if ( !vo_plugin_args ) return;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
262
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
263 mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] remove video filter: %s\n",str );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
264
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
265 while ( vo_plugin_args[n++] ); n--;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
266 if ( n > -1 )
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
267 {
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
268 int i = 0,m = -1;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
269 while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],str ) ) { m=i - 1; break; }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
270 i--;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
271 if ( m > -1 )
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
272 {
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
273 if ( n == 1 ) { free( vo_plugin_args[0] ); free( vo_plugin_args ); vo_plugin_args=NULL; }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
274 else memcpy( &vo_plugin_args[i],&vo_plugin_args[i + 1],( n - i ) * sizeof( char * ) );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
275 }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
276 }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
277 }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
278
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
279 int guiGetEvent( int type,char * arg )
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
280 {
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
281 stream_t * stream = (stream_t *) arg;
5672
1f8b34f1e7c0 ifdef reading dvd args, without it non-dvd compilation fails.
eyck
parents: 5665
diff changeset
282 #ifdef USE_DVDREAD
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
283 dvd_priv_t * dvdp = (dvd_priv_t *) arg;
5672
1f8b34f1e7c0 ifdef reading dvd args, without it non-dvd compilation fails.
eyck
parents: 5665
diff changeset
284 #endif
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
285
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
286 switch ( type )
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
287 {
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
288 case guiXEvent:
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
289 wsEvents( wsDisplay,(XEvent *)arg,NULL );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
290 gtkEventHandling();
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
291 break;
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
292 case guiCEvent:
4963
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
293 switch ( (int)arg )
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
294 {
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
295 case guiSetPlay: guiIntfStruct.Playing=1; mplState(); break;
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
296 case guiSetStop: guiIntfStruct.Playing=0; mplState(); break;
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
297 case guiSetPause: guiIntfStruct.Playing=2; mplState(); break;
13262bd21965 small changes
pontscho
parents: 4858
diff changeset
298 }
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
299 break;
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
300 case guiSetState:
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
301 mplState();
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
302 break;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
303 case guiSetFileName:
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
304 if ( arg ) guiSetFilename( guiIntfStruct.Filename,arg );
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
305 break;
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
306 case guiSetAudioOnly:
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
307 guiIntfStruct.AudioOnly=(int)arg;
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
308 if ( (int)arg ) { guiIntfStruct.NoWindow=True; wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); }
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
309 else wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
310 break;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
311 case guiReDrawSubWindow:
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
312 wsPostRedisplay( &appMPlayer.subWindow );
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
313 break;
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
314 case guiSetShVideo:
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
315 {
5986
d34622ebaf45 window resize bug fixed
pontscho
parents: 5956
diff changeset
316 if ( !appMPlayer.subWindow.isFullScreen )
d34622ebaf45 window resize bug fixed
pontscho
parents: 5956
diff changeset
317 {
d34622ebaf45 window resize bug fixed
pontscho
parents: 5956
diff changeset
318 wsResizeWindow( &appMPlayer.subWindow,vo_dwidth,vo_dheight );
d34622ebaf45 window resize bug fixed
pontscho
parents: 5956
diff changeset
319 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
d34622ebaf45 window resize bug fixed
pontscho
parents: 5956
diff changeset
320 }
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
321 guiIntfStruct.MovieWidth=vo_dwidth;
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5986
diff changeset
322 guiIntfStruct.MovieHeight=vo_dheight;
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
323 }
0132c5747e8a fix audio only files play
pontscho
parents: 5672
diff changeset
324 break;
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
325 #ifdef USE_DVDREAD
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
326 case guiSetDVD:
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
327 guiIntfStruct.DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
328 guiIntfStruct.DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
329 guiIntfStruct.DVD.angles=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
330 guiIntfStruct.DVD.nr_of_audio_channels=dvdp->nr_of_channels;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
331 memcpy( guiIntfStruct.DVD.audio_streams,dvdp->audio_streams,sizeof( dvdp->audio_streams ) );
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
332 guiIntfStruct.DVD.nr_of_subtitles=dvdp->nr_of_subtitles;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
333 memcpy( guiIntfStruct.DVD.subtitles,dvdp->subtitles,sizeof( dvdp->subtitles ) );
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
334 guiIntfStruct.DVD.current_title=dvd_title + 1;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
335 guiIntfStruct.DVD.current_chapter=dvd_chapter + 1;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
336 guiIntfStruct.DVD.current_angle=dvd_angle + 1;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
337 guiIntfStruct.Track=dvd_title + 1;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
338 break;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5120
diff changeset
339 #endif
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
340 case guiSetStream:
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
341 guiIntfStruct.StreamType=stream->type;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
342 switch( stream->type )
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
343 {
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
344 case STREAMTYPE_DVD:
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
345 guiGetEvent( guiSetDVD,(char *)stream->priv );
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
346 break;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
347 #ifdef HAVE_VCD
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
348 case STREAMTYPE_VCD:
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
349 {
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
350 int i;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
351 for ( i=1;i < 100;i++ )
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
352 if ( vcd_seek_to_track( stream->fd,i ) < 0 ) break;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
353 vcd_seek_to_track( stream->fd,vcd_track );
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
354 guiIntfStruct.VCDTracks=--i;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
355 mp_msg( MSGT_GPLAYER,MSGL_INFO,"[interface] vcd tracks: %d\n",guiIntfStruct.VCDTracks );
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
356 guiIntfStruct.Track=vcd_track;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
357 break;
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
358 }
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
359 #endif
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
360 }
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
361 break;
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
362 case guiIEvent:
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
363 printf( "cmd: %d\n",(int)arg );
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
364 switch( (int)arg )
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
365 {
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
366 case MP_CMD_QUIT:
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
367 mplEventHandling( evExit,0 );
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
368 break;
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
369 case MP_CMD_VO_FULLSCREEN:
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
370 mplEventHandling( evFullScreen,0 );
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
371 break;
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
372 default:
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
373 mplEventHandling( guiCMDArray[ (int)arg - MP_CMD_GUI_EVENTS - 1 ],0 );
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
374 }
65730cea02e7 add half new input support for gui
pontscho
parents: 4845
diff changeset
375 break;
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
376 case guiReDraw:
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
377 mplEventHandling( evRedraw,0 );
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
378 break;
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
379 case guiSetVolume:
6903
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
380 if ( audio_out )
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
381 {
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
382 float l,r;
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
383 mixer_getvolume( &l,&r );
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
384 guiIntfStruct.Volume=(r>l?r:l);
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
385 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f;
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
386 else guiIntfStruct.Balance=50.0f;
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
387 btnModify( evSetVolume,guiIntfStruct.Volume );
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
388 btnModify( evSetBalance,guiIntfStruct.Balance );
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
389 }
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
390 break;
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
391 case guiSetFileFormat:
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
392 guiIntfStruct.FileFormat=(int)arg;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
393 break;
6903
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
394 case guiSetValues:
6912
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
395 // -- video
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
396 if ( arg )
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
397 {
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
398 if ( vo_gamma_brightness == 1000 )
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
399 { vo_gamma_brightness=0; get_video_colors( (void *)arg,"brightness",&vo_gamma_brightness ); }
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
400 if ( vo_gamma_contrast == 1000 )
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
401 { vo_gamma_contrast=0; get_video_colors( (void *)arg,"contrast",&vo_gamma_contrast ); }
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
402 if ( vo_gamma_hue == 1000 )
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
403 { vo_gamma_hue=0; get_video_colors( (void *)arg,"hue",&vo_gamma_hue ); }
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
404 if ( vo_gamma_saturation == 1000 )
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
405 { vo_gamma_saturation=0; get_video_colors( (void *)arg,"saturation",&vo_gamma_saturation ); }
5ddd609550d5 - fix equ handling
pontscho
parents: 6903
diff changeset
406 }
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
407
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
408 if ( guiIntfStruct.NoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
409
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
410 // -- audio
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
411 if ( audio_out )
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
412 {
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
413 float l,r;
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
414 mixer_getvolume( &l,&r );
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
415 guiIntfStruct.Volume=(r>l?r:l);
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
416 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
417 else guiIntfStruct.Balance=50.0f;
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
418 btnModify( evSetVolume,guiIntfStruct.Volume );
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
419 btnModify( evSetBalance,guiIntfStruct.Balance );
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
420 }
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
421
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
422 if ( gtkAONoSound ) { if ( !muted ) mixer_mute(); }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
423 else if ( muted ) mixer_mute();
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
424
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
425 if ( gtkEnableAudioEqualizer )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
426 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
427 equalizer_t eq;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
428 int i,j;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
429 for ( i=0;i<6;i++ )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
430 for ( j=0;j<10;j++ )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
431 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
432 eq.channel=i; eq.band=j; eq.gain=gtkEquChannels[i][j];
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
433 gtkSet( gtkSetEqualizer,0,&eq );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
434 }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
435 }
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
436 // -- subtitle
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
437 #ifdef HAVE_DXR3
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
438 if ( !gstrcmp( video_driver,"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS && !gtkVopLAVC && !gtkVopFAME )
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
439 {
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
440 gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVCFAME );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
441 guiIntfStruct.Playing=0;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
442 return True;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
443 }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
444 #endif
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
445 break;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
446 case guiSetDefaults:
6857
pontscho
parents: 6842
diff changeset
447 if ( filename && !guiIntfStruct.Filename )
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
448 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
449 gtkSet( gtkDelPl,0,NULL ); guiIntfStruct.StreamType=STREAMTYPE_FILE;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
450 guiSetFilename( guiIntfStruct.Filename,filename );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
451 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
452
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
453 guiIntfStruct.DiskChanged=0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
454
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
455 // --- video opts
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
456
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
457 if ( !video_driver )
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
458 {
6797
06d29dbdf20d upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents: 6794
diff changeset
459 int i = 0;
6903
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
460 while ( video_out_drivers[i++] )
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
461 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
462 {
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
463 const vo_info_t *info = video_out_drivers[i - 1]->get_info();
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
464 video_driver=gstrdup( (char *)info->short_name );
6903
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
465 break;
c2d4100c964e - fix mixer handling
pontscho
parents: 6898
diff changeset
466 }
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
467 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
468
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
469 if ( !video_driver ) { gtkMessageBox( GTK_MB_FATAL,MSGTR_IDFGCVD ); exit_player( "gui init" ); }
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
470
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
471 {
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
472 int i = 0;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
473 guiIntfStruct.NoWindow=False;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
474 while ( video_out_drivers[i++] )
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
475 if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
476 {
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
477 const vo_info_t *info = video_out_drivers[i - 1]->get_info();
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
478 if ( ( !gstrcmp( video_driver,(char *)info->short_name ) )&&( video_out_drivers[i - 1]->control( VOCTRL_GUI_NOWINDOW,NULL ) == VO_TRUE ) )
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
479 { guiIntfStruct.NoWindow=True; break; }
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
480 }
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
481 }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
482
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
483 #ifdef HAVE_DXR3
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
484 remove_vop( "lavc" );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
485 remove_vop( "fame" );
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
486 if ( !gstrcmp( video_driver,"dxr3" ) )
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
487 {
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
488 #warning workaround for this moment.
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
489 osd_level=0;
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
490 // ---
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
491 if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) )
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
492 {
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
493 if ( gtkVopLAVC ) add_vop( "lavc" );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
494 if ( gtkVopFAME ) add_vop( "fame" );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
495 }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
496 }
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
497 #endif
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
498 // ---
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
499 if ( gtkVopPP ) add_vop( "pp" );
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
500 else remove_vop( "pp" );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
501
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
502 // --- audio opts
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
503 audio_delay=gtkAODelay;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
504 if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; }
6840
ed02bae611d5 - some cosmetic change in preferences
pontscho
parents: 6797
diff changeset
505 if ( gtkAONorm ) gset( &ao_plugin_cfg.plugin_list,"volnorm" );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
506 if ( gtkEnableAudioEqualizer ) gset( &ao_plugin_cfg.plugin_list,"eq" );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
507 if ( gtkAOExtraStereo )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
508 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
509 gset( &ao_plugin_cfg.plugin_list,"extrastereo" );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
510 ao_plugin_cfg.pl_extrastereo_mul=gtkAOExtraStereoMul;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
511 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
512 mixer_device=gtkAOOSSMixer;
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
513 if ( !gstrncmp( audio_driver,"oss",3 ) && gtkAOOSSDevice )
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
514 {
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
515 char * tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 5 );
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
516 sprintf( tmp,"oss:%s",gtkAOOSSDevice );
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
517 gfree( (void *)&audio_driver );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
518 audio_driver=tmp;
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
519 }
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
520
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
521 // -- subtitle
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
522 #ifdef USE_SUB
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
523 sub_name=guiIntfStruct.Subtitlename;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
524 stream_dump_type=0;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
525 if ( gtkSubDumpMPSub ) stream_dump_type=4;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
526 if ( gtkSubDumpSrt ) stream_dump_type=6;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
527 gtkSubDumpMPSub=gtkSubDumpSrt=0;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
528 #endif
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
529 #if defined( USE_OSD ) || defined( USE_SUB )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
530 guiLoadFont();
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
531 #endif
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
532
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
533 // --- misc
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
534 if ( guiIntfStruct.AudioFile ) audio_stream=guiIntfStruct.AudioFile;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
535 else if ( guiIntfStruct.FilenameChanged ) audio_stream=NULL;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
536
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
537 break;
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
538 }
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
539 return False;
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
540 }
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
541
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
542 extern unsigned int GetTimerMS( void );
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
543 extern int mplTimer;
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
544
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
545 void guiEventHandling( void )
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
546 {
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
547 if ( !guiIntfStruct.Playing || guiIntfStruct.NoWindow ) wsHandleEvents();
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
548 gtkEventHandling();
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6280
diff changeset
549 mplTimer=GetTimerMS() / 20;
4798
c39affa2b376 new interface ? :)
pontscho
parents:
diff changeset
550 }
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
551
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
552 // ---
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
553
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
554 float gtkEquChannels[6][10];
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
555
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
556 plItem * plCurrent = NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
557 plItem * plList = NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
558 plItem * plLastPlayed = NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
559
7092
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
560 URLItem *URLList = NULL;
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
561
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
562 #if defined( MP_DEBUG ) && 0
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
563 void list( void )
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
564 {
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
565 plItem * next = plList;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
566 printf( "--- list ---\n" );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
567 while( next || next->next )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
568 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
569 printf( "item: %s/%s\n",next->path,next->name );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
570 if ( next->next ) next=next->next; else break;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
571 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
572 printf( "--- end of list ---\n" );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
573 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
574 #else
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
575 #define list();
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
576 #endif
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
577
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
578 void * gtkSet( int cmd,float fparam, void * vparam )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
579 {
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
580 mp_cmd_t * mp_cmd;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
581 equalizer_t * eq = (equalizer_t *)vparam;
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
582 plItem * item = (plItem *)vparam;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
583
7092
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
584 URLItem * url_item = (URLItem *)vparam;
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
585 int is_added = True;
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
586
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
587 switch ( cmd )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
588 {
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
589 // --- handle playlist
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
590 case gtkAddPlItem: // add item to playlist
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
591 if ( plList )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
592 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
593 plItem * next = plList;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
594 while ( next->next ) { /*printf( "%s\n",next->name );*/ next=next->next; }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
595 next->next=item; item->prev=next;
7092
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
596 } else { item->prev=item->next=NULL; plCurrent=plList=item; }
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
597 list();
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
598 return NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
599 case gtkGetNextPlItem: // get current item from playlist
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
600 if ( plCurrent )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
601 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
602 plCurrent=plCurrent->next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
603 if ( !plCurrent && plList )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
604 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
605 plItem * next = plList;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
606 while ( next->next ) { if ( !next->next ) break; next=next->next; }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
607 plCurrent=next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
608 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
609 return plCurrent;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
610 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
611 return NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
612 case gtkGetPrevPlItem:
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
613 if ( plCurrent )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
614 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
615 plCurrent=plCurrent->prev;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
616 if ( !plCurrent && plList ) plCurrent=plList;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
617 return plCurrent;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
618 }
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
619 return NULL;
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
620 case gtkGetCurrPlItem: // get current item
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
621 return plCurrent;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
622 case gtkDelPl: // delete list
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
623 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
624 plItem * curr = plList;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
625 plItem * next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
626 if ( !plList ) return NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
627 if ( !curr->next )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
628 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
629 if ( curr->path ) free( curr->path );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
630 if ( curr->name ) free( curr->name );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
631 free( curr );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
632 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
633 else
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
634 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
635 while ( curr->next )
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
636 {
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
637 next=curr->next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
638 if ( curr->path ) free( curr->path );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
639 if ( curr->name ) free( curr->name );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
640 free( curr );
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
641 curr=next;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
642 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
643 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
644 plList=NULL; plCurrent=NULL;
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
645 }
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
646 return NULL;
7092
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
647 // ----- Handle url
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
648 case gtkAddURLItem:
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
649 if ( URLList )
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
650 {
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
651 URLItem * next_url = URLList;
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
652 is_added = False;
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
653 while ( next_url->next )
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
654 {
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
655 if ( !gstrcmp( next_url->url,url_item->url ) )
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
656 {
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
657 is_added=True;
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
658 break;
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
659 }
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
660 next_url=next_url->next;
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
661 }
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
662 if ( ( !is_added )&&( gstrcmp( next_url->url,url_item->url ) ) ) next_url->next=url_item;
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
663 } else { url_item->next=NULL; URLList=url_item; }
8e9607c5897e - warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents: 7019
diff changeset
664 return NULL;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
665 // --- subtitle
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
666 case gtkSetSubAuto:
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
667 sub_auto=(int)fparam;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
668 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
669 case gtkSetSubDelay:
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
670 sub_delay=fparam;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
671 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
672 case gtkSetSubFPS:
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
673 sub_fps=(int)fparam;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
674 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
675 case gtkSetSubPos:
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
676 sub_pos=(int)fparam;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
677 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
678 #if defined( USE_OSD ) || defined( USE_SUB )
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
679 case gtkSetFontFactor:
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
680 font_factor=fparam;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
681 guiLoadFont();
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
682 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
683 #endif
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
684 // --- misc
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
685 case gtkClearStruct:
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
686 if ( (unsigned int)vparam & guiFilenames )
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
687 {
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
688 gfree( (void **)&guiIntfStruct.Filename );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
689 gfree( (void **)&guiIntfStruct.Subtitlename );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
690 gfree( (void **)&guiIntfStruct.AudioFile );
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
691 gtkSet( gtkDelPl,0,NULL );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
692 }
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
693 #ifdef USE_DVDREAD
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
694 if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) );
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
695 #endif
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
696 #ifdef HAVE_VCD
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6996
diff changeset
697 if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
698 #endif
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
699 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
700 case gtkSetExtraStereo:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
701 gtkAOExtraStereoMul=fparam;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
702 audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(int)&gtkAOExtraStereoMul );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
703 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
704 case gtkSetAudioDelay:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
705 audio_delay=gtkAODelay=fparam;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
706 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
707 case gtkSetPanscan:
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
708 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
709 mp_cmd->id=MP_CMD_PANSCAN; mp_cmd->name=strdup( "panscan" );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
710 mp_cmd->args[0].v.f=fparam; mp_cmd->args[1].v.i=1;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
711 mp_input_queue_cmd( mp_cmd );
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
712 return NULL;
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
713 case gtkSetAutoq:
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
714 auto_quality=(int)fparam;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
715 return NULL;
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
716 // --- set equalizers
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
717 case gtkSetContrast:
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
718 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
719 mp_cmd->id=MP_CMD_CONTRAST; mp_cmd->name=strdup( "contrast" );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
720 break;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
721 case gtkSetBrightness:
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
722 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
723 mp_cmd->id=MP_CMD_BRIGHTNESS; mp_cmd->name=strdup( "brightness" );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
724 break;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
725 case gtkSetHue:
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
726 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
727 mp_cmd->id=MP_CMD_HUE; mp_cmd->name=strdup( "hue" );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
728 break;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
729 case gtkSetSaturation:
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
730 mp_cmd=(mp_cmd_t *)calloc( 1,sizeof( *mp_cmd ) );
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
731 mp_cmd->id=MP_CMD_SATURATION; mp_cmd->name=strdup( "saturation" );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
732 break;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
733 case gtkSetEqualizer:
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
734 if ( eq )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
735 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
736 gtkEquChannels[eq->channel][eq->band]=eq->gain;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
737 audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)eq );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
738 }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
739 else
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
740 {
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
741 int i,j; equalizer_t tmp; tmp.gain=0.0f;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
742 memset( gtkEquChannels,0,sizeof( gtkEquChannels ) );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
743 for ( i=0;i<6;i++ )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
744 for ( j=0;j<10;j++ )
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
745 { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)&tmp ); }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
746 }
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
747 return NULL;
6794
77980ab4e296 - add preferences support (first try)
pontscho
parents: 6755
diff changeset
748 default: return NULL;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
749 }
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
750 mp_cmd->args[0].v.i=(int)fparam;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
751 mp_cmd->args[1].v.i=1;
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
752 mp_input_queue_cmd( mp_cmd );
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6651
diff changeset
753 return NULL;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
754 }