annotate Gui/mplayer/play.c @ 5920:79f5f072348b

fix fullscreen bug
author pontscho
date Wed, 01 May 2002 14:12:32 +0000
parents 20c335d98ab3
children d34622ebaf45
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4428
3e1378354c2e Compilation fixing
nick
parents: 3479
diff changeset
1 #include <inttypes.h>
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
2 #include <stdlib.h>
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
3 #include <stdio.h>
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
4
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
5 #include <unistd.h>
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
6 #include <signal.h>
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
7
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
8 #include "../wm/ws.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
9 #include "../../config.h"
1884
d21f8afc7680 add to multi lang support
pontscho
parents: 1866
diff changeset
10 #include "../../help_mp.h"
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
11 #include "../../libvo/x11_common.h"
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5046
diff changeset
12 #include "../../input/input.h"
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
13
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
14 #include "../app.h"
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
15
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
16 #include "../wm/wskeys.h"
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
17 #include "../wm/widget.h"
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
18 #include "../interface.h"
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
19
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
20 #include "widgets.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
21 #include "./mplayer.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
22 #include "play.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
23
1800
f5ffb03ebdb5 move skin changing here.
pontscho
parents: 1797
diff changeset
24 #include "../skin/skin.h"
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
25 #include "../skin/font.h"
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
26
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
27 extern float rel_seek_secs;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
28 extern int abs_seek_pos;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
29
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
30 void mplFullScreen( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
31 {
2029
41ed89701ece fix fucking icewm fullscreen bug.
pontscho
parents: 2025
diff changeset
32 static int sx,sy;
2979
6d341644ee28 smal; bugfix for main redraw
pontscho
parents: 2911
diff changeset
33
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5701
diff changeset
34 #if 0
5032
931ce1e11ad1 fix fs handling
pontscho
parents: 4983
diff changeset
35 // if ( !guiIntfStruct.Playing )
2029
41ed89701ece fix fucking icewm fullscreen bug.
pontscho
parents: 2025
diff changeset
36 {
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
37 wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
38 if ( appMPlayer.subWindow.isFullScreen )
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
39 {
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
40 wsResizeWindow( &appMPlayer.subWindow,sx,sy );
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
41 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
42 wsWindowDecoration( &appMPlayer.subWindow,appMPlayer.subWindow.Decorations );
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
43 appMPlayer.subWindow.isFullScreen=0;
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
44 }
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
45 else
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
46 {
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
47 sx=appMPlayer.subWindow.Width; sy=appMPlayer.subWindow.Height;
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
48 wsResizeWindow( &appMPlayer.subWindow,wsMaxX,wsMaxY );
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
49 wsMoveWindow( &appMPlayer.subWindow,True,0,0 );
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
50 wsWindowDecoration( &appMPlayer.subWindow,0 );
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
51 appMPlayer.subWindow.isFullScreen=1;
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
52 }
5032
931ce1e11ad1 fix fs handling
pontscho
parents: 4983
diff changeset
53 vo_fs=appMPlayer.subWindow.isFullScreen;
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
54 wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
5032
931ce1e11ad1 fix fs handling
pontscho
parents: 4983
diff changeset
55 }// else { vo_x11_fullscreen(); appMPlayer.subWindow.isFullScreen=vo_fs; }
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5701
diff changeset
56 #else
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5701
diff changeset
57 wsFullScreen( &appMPlayer.subWindow );
5920
79f5f072348b fix fullscreen bug
pontscho
parents: 5910
diff changeset
58 vo_fs=0;
79f5f072348b fix fullscreen bug
pontscho
parents: 5910
diff changeset
59 if ( appMPlayer.subWindow.isFullScreen ) vo_fs=1;
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5701
diff changeset
60 #endif
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5701
diff changeset
61
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4963
diff changeset
62 fullscreen=appMPlayer.subWindow.isFullScreen;
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
63 if ( guiIntfStruct.Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
2045
deb4aff05c44 fix other bugs
pontscho
parents: 2029
diff changeset
64 else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
65 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
66
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
67 extern int mplSubRender;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
68
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
69 void mplStop()
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
70 {
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
71 guiIntfStruct.Playing=0;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
72 guiIntfStruct.TimeSec=0;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
73 guiIntfStruct.Position=0;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
74 guiIntfStruct.AudioType=0;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
75 // if ( !guiIntfStruct.Playing ) return;
1796
13ea5f992185 fix stop subimage
pontscho
parents: 1791
diff changeset
76 if ( !appMPlayer.subWindow.isFullScreen )
13ea5f992185 fix stop subimage
pontscho
parents: 1791
diff changeset
77 {
2025
0653e90b3118 some bug fix, and sub window render speed up.. 10l kola ? :)
pontscho
parents: 1953
diff changeset
78 wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
2854
fd44ecf77f8d move bug meg fileload bug fixed asszem.
pontscho
parents: 2447
diff changeset
79 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
1796
13ea5f992185 fix stop subimage
pontscho
parents: 1791
diff changeset
80 }
5689
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
81 guiGetEvent( guiCEvent,guiSetStop );
1797
d1aabeb7274f fix after stop redraw. vagy nem.
pontscho
parents: 1796
diff changeset
82 mplSubRender=1;
2045
deb4aff05c44 fix other bugs
pontscho
parents: 2029
diff changeset
83 wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
1953
041483da104e stop bug fix.
pontscho
parents: 1952
diff changeset
84 wsClearWindow( appMPlayer.subWindow );
1797
d1aabeb7274f fix after stop redraw. vagy nem.
pontscho
parents: 1796
diff changeset
85 wsPostRedisplay( &appMPlayer.subWindow );
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
86 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
87
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
88 void mplPlay( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
89 {
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
90 if ( ( !guiIntfStruct.Filename )||
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
91 ( guiIntfStruct.Filename[0] == 0 )||
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
92 ( guiIntfStruct.Playing == 1 ) ) return;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
93 if ( guiIntfStruct.Playing == 2 ) { mplPause(); return; }
4963
13262bd21965 small changes
pontscho
parents: 4818
diff changeset
94 guiGetEvent( guiCEvent,guiSetPlay );
1791
2e86c5c8071e fix subvindov
pontscho
parents: 1784
diff changeset
95 mplSubRender=0;
1858
88a88d0a3f94 fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents: 1852
diff changeset
96 wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
97 wsClearWindow( appMPlayer.subWindow );
4963
13262bd21965 small changes
pontscho
parents: 4818
diff changeset
98 // wsPostRedisplay( &appMPlayer.subWindow );
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
99 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
100
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
101 void mplPause( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
102 {
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5046
diff changeset
103 mp_cmd_t * cmd = (mp_cmd_t *)calloc( 1,sizeof( *cmd ) );
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5046
diff changeset
104 cmd->id=MP_CMD_PAUSE;
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5046
diff changeset
105 cmd->name=strdup("pause");
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5046
diff changeset
106 mp_input_queue_cmd(cmd);
1815
eff8f3c200fa fix resize
pontscho
parents: 1812
diff changeset
107 mplSubRender=0;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
108 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
109
4465
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
110 void mplState( void )
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
111 {
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
112 if ( ( guiIntfStruct.Playing == 0 )||( guiIntfStruct.Playing == 2 ) )
4465
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
113 {
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
114 btnModify( evPlaySwitchToPause,btnReleased );
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
115 btnModify( evPauseSwitchToPlay,btnDisabled );
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
116 }
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
117 else
4465
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
118 {
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
119 btnModify( evPlaySwitchToPause,btnDisabled );
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
120 btnModify( evPauseSwitchToPlay,btnReleased );
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
121 }
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
122 }
b013d01d9968 small bugfixes, and kill other warning
pontscho
parents: 4428
diff changeset
123
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
124 void mplMPlayerInit( int argc,char* argv[], char *envp[] )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
125 {
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
126 guiIntfStruct.Balance=50.0f;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
127 guiIntfStruct.StreamType=-1;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
128 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
129
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
130 float mplGetPosition( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
131 { // return 0.0 ... 100.0
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
132 return guiIntfStruct.Position;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
133 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
134
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
135 void mplRelSeek( float s )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
136 { // -+s
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
137 rel_seek_secs=s; abs_seek_pos=0;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
138 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
139
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
140 void mplAbsSeek( float s )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
141 { // 0.0 ... 100.0
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
142 rel_seek_secs=0.01*s; abs_seek_pos=3;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
143 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
144
1800
f5ffb03ebdb5 move skin changing here.
pontscho
parents: 1797
diff changeset
145 listItems tmpList;
f5ffb03ebdb5 move skin changing here.
pontscho
parents: 1797
diff changeset
146
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
147 void ChangeSkin( char * name )
1800
f5ffb03ebdb5 move skin changing here.
pontscho
parents: 1797
diff changeset
148 {
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
149 int ret;
5690
436cf6ef67fd fix skin loading bug
pontscho
parents: 5689
diff changeset
150
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
151 mainVisible=0;
1800
f5ffb03ebdb5 move skin changing here.
pontscho
parents: 1797
diff changeset
152
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
153 appInitStruct( &tmpList );
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
154 skinAppMPlayer=&tmpList;
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
155 fntFreeFont();
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
156 ret=skinRead( name );
1800
f5ffb03ebdb5 move skin changing here.
pontscho
parents: 1797
diff changeset
157
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
158 appInitStruct( &tmpList );
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
159 skinAppMPlayer=&appMPlayer;
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
160 appInitStruct( &appMPlayer );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
161 if ( ret ) name=skinName;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
162 if ( skinRead( name ) )
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
163 {
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
164 mainVisible=1;
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
165 return;
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
166 }
1800
f5ffb03ebdb5 move skin changing here.
pontscho
parents: 1797
diff changeset
167
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
168 if ( appMPlayer.menuBase.Bitmap.Image )
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
169 {
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
170 if ( mplMenuDrawBuffer ) free( mplMenuDrawBuffer );
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
171 if ( ( mplMenuDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.menuBase.Bitmap.ImageSize ) ) == NULL )
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
172 { mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_NEMDB ); return; }
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
173 wsResizeWindow( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height );
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
174 wsResizeImage( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height );
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
175 }
1800
f5ffb03ebdb5 move skin changing here.
pontscho
parents: 1797
diff changeset
176
2226
9582af160d04 skin chaning bug fix.
pontscho
parents: 2045
diff changeset
177 if ( appMPlayer.sub.Bitmap.Image ) wsResizeImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
178 if ( ( !appMPlayer.subWindow.isFullScreen )&&( !guiIntfStruct.Playing ) )
2226
9582af160d04 skin chaning bug fix.
pontscho
parents: 2045
diff changeset
179 {
9582af160d04 skin chaning bug fix.
pontscho
parents: 2045
diff changeset
180 wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
2854
fd44ecf77f8d move bug meg fileload bug fixed asszem.
pontscho
parents: 2447
diff changeset
181 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
182 }
2226
9582af160d04 skin chaning bug fix.
pontscho
parents: 2045
diff changeset
183 if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
184 if ( !guiIntfStruct.Playing )
2226
9582af160d04 skin chaning bug fix.
pontscho
parents: 2045
diff changeset
185 {
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
186 mplSubRender=1;
2911
7a8cc25832fa skin change bug fix
pontscho
parents: 2854
diff changeset
187 wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
2226
9582af160d04 skin chaning bug fix.
pontscho
parents: 2045
diff changeset
188 wsClearWindow( appMPlayer.subWindow );
9582af160d04 skin chaning bug fix.
pontscho
parents: 2045
diff changeset
189 wsPostRedisplay( &appMPlayer.subWindow );
9582af160d04 skin chaning bug fix.
pontscho
parents: 2045
diff changeset
190 }
1866
32b1bb50a0e8 some bug fix, and add decoration item to skin conffile. faszom(C)
pontscho
parents: 1861
diff changeset
191
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
192 if ( mplDrawBuffer ) free( mplDrawBuffer );
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
193 if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL )
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
194 { mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_NEMDB ); return; }
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
195 wsVisibleWindow( &appMPlayer.mainWindow,wsHideWindow );
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
196 wsResizeWindow( &appMPlayer.mainWindow,appMPlayer.main.width,appMPlayer.main.height );
2854
fd44ecf77f8d move bug meg fileload bug fixed asszem.
pontscho
parents: 2447
diff changeset
197 wsMoveWindow( &appMPlayer.mainWindow,True,appMPlayer.main.x,appMPlayer.main.y );
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
198 wsResizeImage( &appMPlayer.mainWindow,appMPlayer.main.width,appMPlayer.main.height );
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
199 wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image );
2979
6d341644ee28 smal; bugfix for main redraw
pontscho
parents: 2911
diff changeset
200 wsWindowDecoration( &appMPlayer.mainWindow,appMPlayer.mainDecoration );
1907
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
201 mainVisible=1; mplMainRender=1; wsPostRedisplay( &appMPlayer.mainWindow );
83291fafe66c add new features. and fix skin error loop.
pontscho
parents: 1888
diff changeset
202 wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
203
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
204 btnModify( evSetVolume,guiIntfStruct.Volume );
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
205 btnModify( evSetBalance,guiIntfStruct.Balance );
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
206 btnModify( evSetMoviePosition,guiIntfStruct.Position );
3479
2704448de713 fs button bug fix
pontscho
parents: 2979
diff changeset
207 btnModify( evFullScreen,!appMPlayer.subWindow.isFullScreen );
1800
f5ffb03ebdb5 move skin changing here.
pontscho
parents: 1797
diff changeset
208 }
1802
82e77faa7341 async reply fix ?
pontscho
parents: 1800
diff changeset
209
1952
b55163894e30 compile bug fixed.
pontscho
parents: 1907
diff changeset
210 void mplResizeToMovieSize( unsigned int width,unsigned int height )
b55163894e30 compile bug fixed.
pontscho
parents: 1907
diff changeset
211 {
b55163894e30 compile bug fixed.
pontscho
parents: 1907
diff changeset
212 if ( !appMPlayer.subWindow.isFullScreen )
2025
0653e90b3118 some bug fix, and sub window render speed up.. 10l kola ? :)
pontscho
parents: 1953
diff changeset
213 {
1952
b55163894e30 compile bug fixed.
pontscho
parents: 1907
diff changeset
214 wsResizeWindow( &appMPlayer.subWindow,width,height );
2854
fd44ecf77f8d move bug meg fileload bug fixed asszem.
pontscho
parents: 2447
diff changeset
215 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
216 }
1952
b55163894e30 compile bug fixed.
pontscho
parents: 1907
diff changeset
217 }
2854
fd44ecf77f8d move bug meg fileload bug fixed asszem.
pontscho
parents: 2447
diff changeset
218
fd44ecf77f8d move bug meg fileload bug fixed asszem.
pontscho
parents: 2447
diff changeset
219 void mplSetFileName( char * fname )
fd44ecf77f8d move bug meg fileload bug fixed asszem.
pontscho
parents: 2447
diff changeset
220 {
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
221 if ( !fname ) return;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
222 if ( guiIntfStruct.Filename ) free( guiIntfStruct.Filename );
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4798
diff changeset
223 guiIntfStruct.Filename=strdup( fname );
2854
fd44ecf77f8d move bug meg fileload bug fixed asszem.
pontscho
parents: 2447
diff changeset
224 }
5689
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
225
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
226 void mplPrev( void )
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
227 {
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
228 int stop = 0;
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
229 switch ( guiIntfStruct.StreamType )
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
230 {
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
231 // case STREAMTYPE_FILE:
5701
67f0194f3a8c fix compile bug
pontscho
parents: 5690
diff changeset
232 #ifdef USE_DVDREAD
5689
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
233 case STREAMTYPE_DVD:
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
234 if ( guiIntfStruct.Playing == 2 ) break;
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
235 if ( --guiIntfStruct.DVD.current_chapter == 0 )
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
236 {
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
237 guiIntfStruct.DVD.current_chapter=1;
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
238 if ( --guiIntfStruct.DVD.current_title <= 0 ) { guiIntfStruct.DVD.current_title=1; stop=1; }
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
239 }
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
240 guiIntfStruct.Track=guiIntfStruct.DVD.current_title;
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
241 if ( stop ) mplEventHandling( evStop,0 );
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
242 if ( guiIntfStruct.Playing == 1 ) mplEventHandling( evPlay,0 );
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
243 break;
5701
67f0194f3a8c fix compile bug
pontscho
parents: 5690
diff changeset
244 #endif
5689
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
245 }
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
246 }
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
247
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
248 void mplNext( void )
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
249 {
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
250 int stop = 0;
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
251 switch ( guiIntfStruct.StreamType )
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
252 {
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
253 // case STREAMTYPE_FILE:
5701
67f0194f3a8c fix compile bug
pontscho
parents: 5690
diff changeset
254 #ifdef USE_DVDREAD
5689
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
255 case STREAMTYPE_DVD:
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
256 if ( guiIntfStruct.DVD.current_chapter++ == guiIntfStruct.DVD.chapters )
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
257 {
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
258 guiIntfStruct.DVD.current_chapter=1;
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
259 if ( ++guiIntfStruct.DVD.current_title > guiIntfStruct.DVD.titles ) { guiIntfStruct.DVD.current_title=guiIntfStruct.DVD.titles; stop=1; }
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
260 }
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
261 guiIntfStruct.Track=guiIntfStruct.DVD.current_title;
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
262 if ( stop ) mplEventHandling( evStop,0 );
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
263 if ( guiIntfStruct.Playing == 1 ) mplEventHandling( evPlay,0 );
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
264 break;
5701
67f0194f3a8c fix compile bug
pontscho
parents: 5690
diff changeset
265 #endif
5689
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
266 }
2077782d0ca9 add prev/next title feature for gui dvd support
pontscho
parents: 5665
diff changeset
267 }