annotate Gui/mplayer/play.c @ 1756:9621e4d14c6d

fullscreen fixed
author pontscho
date Wed, 29 Aug 2001 17:48:06 +0000
parents e955ee46d3e0
children 6f35d37af91c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
1
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 int mplParent = 1;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
9
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1723
diff changeset
10 int mplx,mply,mplwidth,mplheight;
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
11
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
12 #include "../app.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
13
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
14 #include "../wm/ws.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
15 #include "../wm/wskeys.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
16 #include "../wm/widget.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
17
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
18 #include "../../config.h"
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
19 #include "../../libvo/x11_common.h"
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
20
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
21 #include "widgets.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
22 #include "./mplayer.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
23 #include "psignal.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
24 #include "play.h"
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
25
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
26 mplCommStruct * mplShMem;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
27 char * Filename = NULL;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
28
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
29 extern float rel_seek_secs;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
30 extern int abs_seek_pos;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
31
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
32
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
33 void mplPlayerThread( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
34 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
35 // mplayer( 0,NULL,NULL );
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
36 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
37
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
38 void mplFullScreen( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
39 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
40 if ( appMPlayer.subWindow.isFullScreen )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
41 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
42 if ( mplShMem->Playing )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
43 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
44 appMPlayer.subWindow.OldX=mplx;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
45 appMPlayer.subWindow.OldY=mply;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
46 appMPlayer.subWindow.OldWidth=mplwidth;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
47 appMPlayer.subWindow.OldHeight=mplheight;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
48 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
49 else
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
50 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
51 appMPlayer.subWindow.OldWidth=appMPlayer.sub.width;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
52 appMPlayer.subWindow.OldHeight=appMPlayer.sub.height;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
53 appMPlayer.subWindow.OldX=( wsMaxX - appMPlayer.sub.width ) / 2;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
54 appMPlayer.subWindow.OldY=( wsMaxY - appMPlayer.sub.height ) / 2;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
55 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
56 }
1756
9621e4d14c6d fullscreen fixed
pontscho
parents: 1747
diff changeset
57 else
9621e4d14c6d fullscreen fixed
pontscho
parents: 1747
diff changeset
58 {
9621e4d14c6d fullscreen fixed
pontscho
parents: 1747
diff changeset
59 mplx=appMPlayer.subWindow.OldX;
9621e4d14c6d fullscreen fixed
pontscho
parents: 1747
diff changeset
60 mply=appMPlayer.subWindow.OldY;
9621e4d14c6d fullscreen fixed
pontscho
parents: 1747
diff changeset
61 mplwidth=appMPlayer.subWindow.OldWidth;
9621e4d14c6d fullscreen fixed
pontscho
parents: 1747
diff changeset
62 mplheight=appMPlayer.subWindow.OldHeight;
9621e4d14c6d fullscreen fixed
pontscho
parents: 1747
diff changeset
63 }
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
64 wsFullScreen( &appMPlayer.subWindow );
1756
9621e4d14c6d fullscreen fixed
pontscho
parents: 1747
diff changeset
65 // wsMoveTopWindow( &appMPlayer.subWindow );
9621e4d14c6d fullscreen fixed
pontscho
parents: 1747
diff changeset
66 mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
67 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
68
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
69 extern int mplSubRender;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
70
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
71 void mplStop()
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
72 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
73 if ( !mplShMem->Playing ) return;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
74 // ---
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
75 printf("%%%%%% STOP \n");
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
76 // ---
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
77 mplShMem->Playing=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
78 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
79
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
80 void mplPlay( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
81 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
82 if ( !Filename ) return;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
83 if ( mplShMem->Playing ) mplStop();
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
84 // ---
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
85 printf("%%%%%% PLAY \n");
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
86 // ---
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
87 mplShMem->Playing=1;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
88 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
89
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
90 void mplPause( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
91 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
92 if ( mplShMem->Playing != 1 ) return;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
93 // ---
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
94 printf("%%%%%% PAUSE \n");
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
95 // ---
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
96 mplShMem->Playing=2;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
97 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
98
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
99 void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
100 {
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
101
1756
9621e4d14c6d fullscreen fixed
pontscho
parents: 1747
diff changeset
102 printf("mplResize(%d,%d,%d,%d) \n",X,Y,width,height);
1747
e955ee46d3e0 fix fullscreen
pontscho
parents: 1743
diff changeset
103 vo_setwindowsize( width,height );
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
104 vo_resize=1;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
105
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
106 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
107
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
108 void mplMPlayerInit( int argc,char* argv[], char *envp[] )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
109 {
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1723
diff changeset
110 #if 0
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
111 mplShMem=shmem_alloc( ShMemSize );
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1723
diff changeset
112 #else
d6c99f70449e fix hprogressbar
pontscho
parents: 1723
diff changeset
113 mplShMem=calloc( 1,ShMemSize );
d6c99f70449e fix hprogressbar
pontscho
parents: 1723
diff changeset
114 #endif
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
115 signal( SIGTYPE,mplMainSigHandler );
1743
b266f763cad3 fix playing
pontscho
parents: 1729
diff changeset
116 // signal( SIGCHLD,SIG_IGN );
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
117
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
118 mplShMem->Playing=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
119 mplShMem->Volume=0.0f;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
120 mplShMem->Position=0.0f;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
121 mplShMem->Balance=50.0f;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
122 mplShMem->Track=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
123 mplShMem->AudioType=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
124 mplShMem->StreamType=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
125 mplShMem->TimeSec=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
126 mplShMem->LengthInSec=0;
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
127
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 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
131
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
132 float mplGetPosition( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
133 { // return 0.0 ... 100.0
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1723
diff changeset
134 return mplShMem->Position;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
135 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
136
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
137 void mplRelSeek( float s )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
138 { // -+s
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
139 // ---
1743
b266f763cad3 fix playing
pontscho
parents: 1729
diff changeset
140 //printf("%%%%%% RelSEEK=%5.3f \n",s);
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
141 // ---
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
142 rel_seek_secs=s; abs_seek_pos=0;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
143 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
144
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
145 void mplAbsSeek( float s )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
146 { // 0.0 ... 100.0
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
147 // ---
1743
b266f763cad3 fix playing
pontscho
parents: 1729
diff changeset
148 //printf("%%%%%% AbsSEEK=%5.3f \n",s);
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1693
diff changeset
149 rel_seek_secs=0.01*s; abs_seek_pos=3;
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
150 // ---
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
151 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
152
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
153 void mplIncAudioBufDelay( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
154 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
155 }
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
156
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
157 void mplDecAudioBufDelay( void )
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
158 {
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
159 }