author | simon <simon> | 2002-12-13 22:40:57 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-13 22:40:57 (UTC) |
commit | d178168d0980e62d6ce1acb92b6b62c07b64ea34 (patch) (unidiff) | |
tree | 666c8db2a8351d64d9e3e9d16ca202be6a31a16b | |
parent | 24a30625ec822a7c55e4d4175c5fe40ba05c883e (diff) | |
download | opie-d178168d0980e62d6ce1acb92b6b62c07b64ea34.zip opie-d178168d0980e62d6ce1acb92b6b62c07b64ea34.tar.gz opie-d178168d0980e62d6ce1acb92b6b62c07b64ea34.tar.bz2 |
- prepare the API for threaded initialization, step one
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 16 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 13 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 2 |
3 files changed, 26 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 1e0dc21..6431de7 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -1,301 +1,315 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 LJP <> | 5 | Copyright (c) 2002 LJP <> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <stdio.h> | 34 | #include <stdio.h> |
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | #include <qimage.h> | 36 | #include <qimage.h> |
37 | #include <qtextstream.h> | 37 | #include <qtextstream.h> |
38 | #include <qpe/resource.h> | 38 | #include <qpe/resource.h> |
39 | 39 | ||
40 | #include <qfile.h> | 40 | #include <qfile.h> |
41 | #include <qdir.h> | 41 | #include <qdir.h> |
42 | 42 | ||
43 | #include <qgfx_qws.h> | 43 | #include <qgfx_qws.h> |
44 | #include <qdirectpainter_qws.h> | 44 | #include <qdirectpainter_qws.h> |
45 | 45 | ||
46 | #include <assert.h> | 46 | #include <assert.h> |
47 | 47 | ||
48 | #include "xinevideowidget.h" | 48 | #include "xinevideowidget.h" |
49 | #include "frame.h" | 49 | #include "frame.h" |
50 | #include "lib.h" | 50 | #include "lib.h" |
51 | 51 | ||
52 | 52 | ||
53 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | 53 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, |
54 | int width, int height,int bytes ); | 54 | int width, int height,int bytes ); |
55 | 55 | ||
56 | extern "C" { | 56 | extern "C" { |
57 | xine_vo_driver_t* init_video_out_plugin( xine_t *xine, void* video, display_xine_frame_t, void * ); | 57 | xine_vo_driver_t* init_video_out_plugin( xine_t *xine, void* video, display_xine_frame_t, void * ); |
58 | int null_is_showing_video( const xine_vo_driver_t* self ); | 58 | int null_is_showing_video( const xine_vo_driver_t* self ); |
59 | void null_set_show_video( const xine_vo_driver_t* self, int show ); | 59 | void null_set_show_video( const xine_vo_driver_t* self, int show ); |
60 | int null_is_fullscreen( const xine_vo_driver_t* self ); | 60 | int null_is_fullscreen( const xine_vo_driver_t* self ); |
61 | void null_set_fullscreen( const xine_vo_driver_t* self, int screen ); | 61 | void null_set_fullscreen( const xine_vo_driver_t* self, int screen ); |
62 | int null_is_scaling( const xine_vo_driver_t* self ); | 62 | int null_is_scaling( const xine_vo_driver_t* self ); |
63 | void null_set_scaling( const xine_vo_driver_t* self, int scale ); | 63 | void null_set_scaling( const xine_vo_driver_t* self, int scale ); |
64 | void null_set_gui_width( const xine_vo_driver_t* self, int width ); | 64 | void null_set_gui_width( const xine_vo_driver_t* self, int width ); |
65 | void null_set_gui_height( const xine_vo_driver_t* self, int height ); | 65 | void null_set_gui_height( const xine_vo_driver_t* self, int height ); |
66 | void null_set_mode( const xine_vo_driver_t* self, int depth, int rgb ); | 66 | void null_set_mode( const xine_vo_driver_t* self, int depth, int rgb ); |
67 | void null_set_videoGamma( const xine_vo_driver_t* self , int value ); | 67 | void null_set_videoGamma( const xine_vo_driver_t* self , int value ); |
68 | void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data ); | 68 | void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data ); |
69 | } | 69 | } |
70 | 70 | ||
71 | using namespace XINE; | 71 | using namespace XINE; |
72 | 72 | ||
73 | Lib::Lib( XineVideoWidget* widget ) | 73 | Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) |
74 | { | 74 | { |
75 | m_video = false; | 75 | m_video = false; |
76 | m_wid = widget; | 76 | m_wid = widget; |
77 | printf("Lib"); | 77 | printf("Lib"); |
78 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; | 78 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; |
79 | // get the configuration | 79 | // get the configuration |
80 | 80 | ||
81 | // not really OO, should be an extra class, later | 81 | // not really OO, should be an extra class, later |
82 | if ( !QFile::exists(configPath) ) { | 82 | if ( !QFile::exists(configPath) ) { |
83 | QFile f(configPath); | 83 | QFile f(configPath); |
84 | f.open(IO_WriteOnly); | 84 | f.open(IO_WriteOnly); |
85 | QTextStream ts( &f ); | 85 | QTextStream ts( &f ); |
86 | ts << "misc.memcpy_method:glibc\n"; | 86 | ts << "misc.memcpy_method:glibc\n"; |
87 | f.close(); | 87 | f.close(); |
88 | } | 88 | } |
89 | 89 | ||
90 | if ( initMode == InitializeImmediately ) | ||
91 | initialize(); | ||
92 | else | ||
93 | assert( false ); | ||
94 | } | ||
95 | |||
96 | void Lib::run() | ||
97 | { | ||
98 | assert( false ); | ||
99 | } | ||
100 | |||
101 | void Lib::initialize() | ||
102 | { | ||
90 | m_xine = xine_new( ); | 103 | m_xine = xine_new( ); |
91 | 104 | ||
105 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; | ||
92 | xine_config_load( m_xine, QFile::encodeName( configPath ) ); | 106 | xine_config_load( m_xine, QFile::encodeName( configPath ) ); |
93 | 107 | ||
94 | xine_init( m_xine ); | 108 | xine_init( m_xine ); |
95 | 109 | ||
96 | // allocate oss for sound | 110 | // allocate oss for sound |
97 | // and fb for framebuffer | 111 | // and fb for framebuffer |
98 | m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL ); | 112 | m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL ); |
99 | m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this ); | 113 | m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this ); |
100 | 114 | ||
101 | 115 | ||
102 | //xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL); | 116 | //xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL); |
103 | 117 | ||
104 | 118 | ||
105 | // null_display_handler( m_videoOutput, xine_display_frame, this ); | 119 | // null_display_handler( m_videoOutput, xine_display_frame, this ); |
106 | 120 | ||
107 | m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); | 121 | m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); |
108 | 122 | ||
109 | if (m_wid != 0 ) { | 123 | if (m_wid != 0 ) { |
110 | printf( "!0\n" ); | 124 | printf( "!0\n" ); |
111 | resize ( m_wid-> size ( ) ); | 125 | resize ( m_wid-> size ( ) ); |
112 | ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); | 126 | ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); |
113 | 127 | ||
114 | // m_wid->repaint(); | 128 | // m_wid->repaint(); |
115 | } | 129 | } |
116 | 130 | ||
117 | m_queue = xine_event_new_queue (m_stream); | 131 | m_queue = xine_event_new_queue (m_stream); |
118 | 132 | ||
119 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); | 133 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); |
120 | } | 134 | } |
121 | 135 | ||
122 | Lib::~Lib() { | 136 | Lib::~Lib() { |
123 | // free( m_config ); | 137 | // free( m_config ); |
124 | 138 | ||
125 | xine_close( m_stream ); | 139 | xine_close( m_stream ); |
126 | 140 | ||
127 | xine_event_dispose_queue( m_queue ); | 141 | xine_event_dispose_queue( m_queue ); |
128 | 142 | ||
129 | xine_dispose( m_stream ); | 143 | xine_dispose( m_stream ); |
130 | 144 | ||
131 | xine_exit( m_xine ); | 145 | xine_exit( m_xine ); |
132 | /* FIXME either free or delete but valgrind bitches against both */ | 146 | /* FIXME either free or delete but valgrind bitches against both */ |
133 | //free( m_videoOutput ); | 147 | //free( m_videoOutput ); |
134 | //delete m_audioOutput; | 148 | //delete m_audioOutput; |
135 | } | 149 | } |
136 | 150 | ||
137 | void Lib::resize ( const QSize &s ) { | 151 | void Lib::resize ( const QSize &s ) { |
138 | if ( s. width ( ) && s. height ( ) ) { | 152 | if ( s. width ( ) && s. height ( ) ) { |
139 | ::null_set_gui_width( m_videoOutput, s. width() ); | 153 | ::null_set_gui_width( m_videoOutput, s. width() ); |
140 | ::null_set_gui_height( m_videoOutput, s. height() ); | 154 | ::null_set_gui_height( m_videoOutput, s. height() ); |
141 | } | 155 | } |
142 | } | 156 | } |
143 | 157 | ||
144 | int Lib::majorVersion() { | 158 | int Lib::majorVersion() { |
145 | int major, minor, sub; | 159 | int major, minor, sub; |
146 | xine_get_version ( &major, &minor, &sub ); | 160 | xine_get_version ( &major, &minor, &sub ); |
147 | return major; | 161 | return major; |
148 | } | 162 | } |
149 | 163 | ||
150 | int Lib::minorVersion() { | 164 | int Lib::minorVersion() { |
151 | int major, minor, sub; | 165 | int major, minor, sub; |
152 | xine_get_version ( &major, &minor, &sub ); | 166 | xine_get_version ( &major, &minor, &sub ); |
153 | return minor; | 167 | return minor; |
154 | } | 168 | } |
155 | 169 | ||
156 | int Lib::subVersion() { | 170 | int Lib::subVersion() { |
157 | int major, minor, sub; | 171 | int major, minor, sub; |
158 | xine_get_version ( &major, &minor, &sub ); | 172 | xine_get_version ( &major, &minor, &sub ); |
159 | return sub; | 173 | return sub; |
160 | } | 174 | } |
161 | 175 | ||
162 | int Lib::play( const QString& fileName, int startPos, int start_time ) { | 176 | int Lib::play( const QString& fileName, int startPos, int start_time ) { |
163 | QString str = fileName.stripWhiteSpace(); | 177 | QString str = fileName.stripWhiteSpace(); |
164 | if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) { | 178 | if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) { |
165 | return 0; | 179 | return 0; |
166 | } | 180 | } |
167 | return xine_play( m_stream, startPos, start_time); | 181 | return xine_play( m_stream, startPos, start_time); |
168 | } | 182 | } |
169 | 183 | ||
170 | void Lib::stop() { | 184 | void Lib::stop() { |
171 | qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); | 185 | qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); |
172 | xine_stop( m_stream ); | 186 | xine_stop( m_stream ); |
173 | } | 187 | } |
174 | 188 | ||
175 | void Lib::pause( bool toggle ) { | 189 | void Lib::pause( bool toggle ) { |
176 | xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL ); | 190 | xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL ); |
177 | } | 191 | } |
178 | 192 | ||
179 | int Lib::speed() const { | 193 | int Lib::speed() const { |
180 | return xine_get_param ( m_stream, XINE_PARAM_SPEED ); | 194 | return xine_get_param ( m_stream, XINE_PARAM_SPEED ); |
181 | } | 195 | } |
182 | 196 | ||
183 | void Lib::setSpeed( int speed ) { | 197 | void Lib::setSpeed( int speed ) { |
184 | xine_set_param ( m_stream, XINE_PARAM_SPEED, speed ); | 198 | xine_set_param ( m_stream, XINE_PARAM_SPEED, speed ); |
185 | } | 199 | } |
186 | 200 | ||
187 | int Lib::status() const { | 201 | int Lib::status() const { |
188 | return xine_get_status( m_stream ); | 202 | return xine_get_status( m_stream ); |
189 | } | 203 | } |
190 | 204 | ||
191 | int Lib::currentPosition() const { | 205 | int Lib::currentPosition() const { |
192 | int pos, time, length; | 206 | int pos, time, length; |
193 | xine_get_pos_length( m_stream, &pos, &time, &length ); | 207 | xine_get_pos_length( m_stream, &pos, &time, &length ); |
194 | return pos; | 208 | return pos; |
195 | } | 209 | } |
196 | 210 | ||
197 | int Lib::currentTime() const { | 211 | int Lib::currentTime() const { |
198 | int pos, time, length; | 212 | int pos, time, length; |
199 | xine_get_pos_length( m_stream, &pos, &time, &length ); | 213 | xine_get_pos_length( m_stream, &pos, &time, &length ); |
200 | return time/1000; | 214 | return time/1000; |
201 | } | 215 | } |
202 | 216 | ||
203 | int Lib::length() const { | 217 | int Lib::length() const { |
204 | int pos, time, length; | 218 | int pos, time, length; |
205 | xine_get_pos_length( m_stream, &pos, &time, &length ); | 219 | xine_get_pos_length( m_stream, &pos, &time, &length ); |
206 | return length/1000; | 220 | return length/1000; |
207 | } | 221 | } |
208 | 222 | ||
209 | bool Lib::isSeekable() const { | 223 | bool Lib::isSeekable() const { |
210 | return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE ); | 224 | return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE ); |
211 | } | 225 | } |
212 | 226 | ||
213 | void Lib::seekTo( int time ) { | 227 | void Lib::seekTo( int time ) { |
214 | //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_( | 228 | //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_( |
215 | // since its now milliseconds we need *1000 | 229 | // since its now milliseconds we need *1000 |
216 | xine_play( m_stream, 0, time*1000 ); | 230 | xine_play( m_stream, 0, time*1000 ); |
217 | } | 231 | } |
218 | 232 | ||
219 | 233 | ||
220 | Frame Lib::currentFrame() const { | 234 | Frame Lib::currentFrame() const { |
221 | Frame frame; | 235 | Frame frame; |
222 | return frame; | 236 | return frame; |
223 | }; | 237 | }; |
224 | 238 | ||
225 | QString Lib::metaInfo( int number) const { | 239 | QString Lib::metaInfo( int number) const { |
226 | return xine_get_meta_info( m_stream, number ); | 240 | return xine_get_meta_info( m_stream, number ); |
227 | } | 241 | } |
228 | 242 | ||
229 | int Lib::error() const { | 243 | int Lib::error() const { |
230 | return xine_get_error( m_stream ); | 244 | return xine_get_error( m_stream ); |
231 | }; | 245 | }; |
232 | 246 | ||
233 | void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ) | 247 | void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ) |
234 | { | 248 | { |
235 | assert( sendType == ThreadUtil::Channel::OneWay ); | 249 | assert( sendType == ThreadUtil::Channel::OneWay ); |
236 | handleXineEvent( msg->type() ); | 250 | handleXineEvent( msg->type() ); |
237 | delete msg; | 251 | delete msg; |
238 | } | 252 | } |
239 | 253 | ||
240 | void Lib::handleXineEvent( const xine_event_t* t ) { | 254 | void Lib::handleXineEvent( const xine_event_t* t ) { |
241 | send( new ThreadUtil::ChannelMessage( t->type ), OneWay ); | 255 | send( new ThreadUtil::ChannelMessage( t->type ), OneWay ); |
242 | } | 256 | } |
243 | 257 | ||
244 | void Lib::handleXineEvent( int type ) { | 258 | void Lib::handleXineEvent( int type ) { |
245 | if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) { | 259 | if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) { |
246 | emit stopped(); | 260 | emit stopped(); |
247 | } | 261 | } |
248 | } | 262 | } |
249 | 263 | ||
250 | 264 | ||
251 | void Lib::setShowVideo( bool video ) { | 265 | void Lib::setShowVideo( bool video ) { |
252 | m_video = video; | 266 | m_video = video; |
253 | ::null_set_show_video( m_videoOutput, video ); | 267 | ::null_set_show_video( m_videoOutput, video ); |
254 | } | 268 | } |
255 | 269 | ||
256 | bool Lib::isShowingVideo() const { | 270 | bool Lib::isShowingVideo() const { |
257 | return ::null_is_showing_video( m_videoOutput ); | 271 | return ::null_is_showing_video( m_videoOutput ); |
258 | } | 272 | } |
259 | 273 | ||
260 | bool Lib::hasVideo() const { | 274 | bool Lib::hasVideo() const { |
261 | return xine_get_stream_info( m_stream, 18 ); | 275 | return xine_get_stream_info( m_stream, 18 ); |
262 | } | 276 | } |
263 | 277 | ||
264 | void Lib::showVideoFullScreen( bool fullScreen ) { | 278 | void Lib::showVideoFullScreen( bool fullScreen ) { |
265 | ::null_set_fullscreen( m_videoOutput, fullScreen ); | 279 | ::null_set_fullscreen( m_videoOutput, fullScreen ); |
266 | } | 280 | } |
267 | 281 | ||
268 | bool Lib::isVideoFullScreen() const { | 282 | bool Lib::isVideoFullScreen() const { |
269 | return ::null_is_fullscreen( m_videoOutput ); | 283 | return ::null_is_fullscreen( m_videoOutput ); |
270 | } | 284 | } |
271 | 285 | ||
272 | void Lib::setScaling( bool scale ) { | 286 | void Lib::setScaling( bool scale ) { |
273 | ::null_set_scaling( m_videoOutput, scale ); | 287 | ::null_set_scaling( m_videoOutput, scale ); |
274 | } | 288 | } |
275 | 289 | ||
276 | void Lib::setGamma( int value ) { | 290 | void Lib::setGamma( int value ) { |
277 | //qDebug( QString( "%1").arg(value) ); | 291 | //qDebug( QString( "%1").arg(value) ); |
278 | /* int gammaValue = ( 100 + value ); */ | 292 | /* int gammaValue = ( 100 + value ); */ |
279 | ::null_set_videoGamma( m_videoOutput, value ); | 293 | ::null_set_videoGamma( m_videoOutput, value ); |
280 | } | 294 | } |
281 | 295 | ||
282 | bool Lib::isScaling() const { | 296 | bool Lib::isScaling() const { |
283 | return ::null_is_scaling( m_videoOutput ); | 297 | return ::null_is_scaling( m_videoOutput ); |
284 | } | 298 | } |
285 | 299 | ||
286 | void Lib::xine_event_handler( void* user_data, const xine_event_t* t ) { | 300 | void Lib::xine_event_handler( void* user_data, const xine_event_t* t ) { |
287 | ( (Lib*)user_data)->handleXineEvent( t ); | 301 | ( (Lib*)user_data)->handleXineEvent( t ); |
288 | } | 302 | } |
289 | 303 | ||
290 | void Lib::xine_display_frame( void* user_data, uint8_t *frame, | 304 | void Lib::xine_display_frame( void* user_data, uint8_t *frame, |
291 | int width, int height, int bytes ) { | 305 | int width, int height, int bytes ) { |
292 | ( (Lib*)user_data)->drawFrame( frame, width, height, bytes ); | 306 | ( (Lib*)user_data)->drawFrame( frame, width, height, bytes ); |
293 | } | 307 | } |
294 | 308 | ||
295 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { | 309 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { |
296 | if ( !m_video ) { | 310 | if ( !m_video ) { |
297 | qWarning("not showing video now"); | 311 | qWarning("not showing video now"); |
298 | return; | 312 | return; |
299 | } | 313 | } |
300 | m_wid-> setVideoFrame ( frame, width, height, bytes ); | 314 | m_wid-> setVideoFrame ( frame, width, height, bytes ); |
301 | } | 315 | } |
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index aba2ec9..6363918 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h | |||
@@ -1,208 +1,215 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 LJP <> | 5 | Copyright (c) 2002 LJP <> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #ifndef ZECKEXINELIB_H | 34 | #ifndef ZECKEXINELIB_H |
35 | #define ZECKEXINELIB_H | 35 | #define ZECKEXINELIB_H |
36 | 36 | ||
37 | #include <qcstring.h> | 37 | #include <qcstring.h> |
38 | #include <qstring.h> | 38 | #include <qstring.h> |
39 | #include <qobject.h> | 39 | #include <qobject.h> |
40 | 40 | ||
41 | #include <xine.h> | 41 | #include <xine.h> |
42 | //#include "xine.h" | 42 | //#include "xine.h" |
43 | 43 | ||
44 | #include "threadutil.h" | 44 | #include "threadutil.h" |
45 | 45 | ||
46 | class XineVideoWidget; | 46 | class XineVideoWidget; |
47 | 47 | ||
48 | namespace XINE { | 48 | namespace XINE { |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * Lib wrapps the simple interface | 51 | * Lib wrapps the simple interface |
52 | * of libxine for easy every day use | 52 | * of libxine for easy every day use |
53 | * This will become a full C++ Wrapper | 53 | * This will become a full C++ Wrapper |
54 | * It supports playing, pausing, info, | 54 | * It supports playing, pausing, info, |
55 | * stooping, seeking. | 55 | * stooping, seeking. |
56 | */ | 56 | */ |
57 | class Frame; | 57 | class Frame; |
58 | class Lib : public ThreadUtil::Channel | 58 | class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread |
59 | { | 59 | { |
60 | Q_OBJECT | 60 | Q_OBJECT |
61 | public: | 61 | public: |
62 | Lib(XineVideoWidget* = 0); | 62 | enum InitializationMode { InitializeImmediately, InitializeInThread }; |
63 | |||
64 | Lib( InitializationMode initMode, XineVideoWidget* = 0); | ||
65 | |||
63 | ~Lib(); | 66 | ~Lib(); |
64 | static int majorVersion(); | 67 | static int majorVersion(); |
65 | static int minorVersion(); | 68 | static int minorVersion(); |
66 | static int subVersion(); | 69 | static int subVersion(); |
67 | 70 | ||
68 | 71 | ||
69 | void resize ( const QSize &s ); | 72 | void resize ( const QSize &s ); |
70 | 73 | ||
71 | int play( const QString& fileName, | 74 | int play( const QString& fileName, |
72 | int startPos = 0, | 75 | int startPos = 0, |
73 | int start_time = 0 ); | 76 | int start_time = 0 ); |
74 | void stop(); | 77 | void stop(); |
75 | void pause( bool toggle ); | 78 | void pause( bool toggle ); |
76 | 79 | ||
77 | int speed() const; | 80 | int speed() const; |
78 | 81 | ||
79 | /** | 82 | /** |
80 | * Set the speed of the stream, if codec supports it | 83 | * Set the speed of the stream, if codec supports it |
81 | * XINE_SPEED_PAUSE 0 | 84 | * XINE_SPEED_PAUSE 0 |
82 | * XINE_SPEED_SLOW_4 1 | 85 | * XINE_SPEED_SLOW_4 1 |
83 | * XINE_SPEED_SLOW_2 2 | 86 | * XINE_SPEED_SLOW_2 2 |
84 | * XINE_SPEED_NORMAL 4 | 87 | * XINE_SPEED_NORMAL 4 |
85 | * XINE_SPEED_FAST_2 8 | 88 | * XINE_SPEED_FAST_2 8 |
86 | *XINE_SPEED_FAST_4 16 | 89 | *XINE_SPEED_FAST_4 16 |
87 | */ | 90 | */ |
88 | void setSpeed( int speed = XINE_SPEED_PAUSE ); | 91 | void setSpeed( int speed = XINE_SPEED_PAUSE ); |
89 | 92 | ||
90 | int status() const; | 93 | int status() const; |
91 | 94 | ||
92 | int currentPosition()const; | 95 | int currentPosition()const; |
93 | //in seconds | 96 | //in seconds |
94 | int currentTime()const; | 97 | int currentTime()const; |
95 | 98 | ||
96 | int length() const; | 99 | int length() const; |
97 | 100 | ||
98 | bool isSeekable()const; | 101 | bool isSeekable()const; |
99 | 102 | ||
100 | /** | 103 | /** |
101 | * Whether or not to show video output | 104 | * Whether or not to show video output |
102 | */ | 105 | */ |
103 | void setShowVideo(bool video); | 106 | void setShowVideo(bool video); |
104 | 107 | ||
105 | /** | 108 | /** |
106 | * is we show video | 109 | * is we show video |
107 | */ | 110 | */ |
108 | bool isShowingVideo() const; | 111 | bool isShowingVideo() const; |
109 | 112 | ||
110 | /** | 113 | /** |
111 | * | 114 | * |
112 | */ | 115 | */ |
113 | void showVideoFullScreen( bool fullScreen ); | 116 | void showVideoFullScreen( bool fullScreen ); |
114 | 117 | ||
115 | /** | 118 | /** |
116 | * | 119 | * |
117 | */ | 120 | */ |
118 | bool isVideoFullScreen() const; | 121 | bool isVideoFullScreen() const; |
119 | 122 | ||
120 | 123 | ||
121 | /** | 124 | /** |
122 | * Get the meta info (like author etc) from the stream | 125 | * Get the meta info (like author etc) from the stream |
123 | * XINE_META_INFO_TITLE 0 | 126 | * XINE_META_INFO_TITLE 0 |
124 | * XINE_META_INFO_COMMENT 1 | 127 | * XINE_META_INFO_COMMENT 1 |
125 | * XINE_META_INFO_ARTIST 2 | 128 | * XINE_META_INFO_ARTIST 2 |
126 | * XINE_META_INFO_GENRE 3 | 129 | * XINE_META_INFO_GENRE 3 |
127 | * XINE_META_INFO_ALBUM 4 | 130 | * XINE_META_INFO_ALBUM 4 |
128 | * XINE_META_INFO_YEAR 5 | 131 | * XINE_META_INFO_YEAR 5 |
129 | * XINE_META_INFO_VIDEOCODEC 6 | 132 | * XINE_META_INFO_VIDEOCODEC 6 |
130 | * XINE_META_INFO_AUDIOCODEC 7 | 133 | * XINE_META_INFO_AUDIOCODEC 7 |
131 | * XINE_META_INFO_SYSTEMLAYER 8 | 134 | * XINE_META_INFO_SYSTEMLAYER 8 |
132 | * XINE_META_INFO_INPUT_PLUGIN 9 | 135 | * XINE_META_INFO_INPUT_PLUGIN 9 |
133 | */ | 136 | */ |
134 | QString metaInfo( int number ) const; | 137 | QString metaInfo( int number ) const; |
135 | 138 | ||
136 | /** | 139 | /** |
137 | * | 140 | * |
138 | */ | 141 | */ |
139 | bool isScaling() const; | 142 | bool isScaling() const; |
140 | 143 | ||
141 | /** | 144 | /** |
142 | * seek to a position | 145 | * seek to a position |
143 | */ | 146 | */ |
144 | void seekTo( int time ); | 147 | void seekTo( int time ); |
145 | 148 | ||
146 | /** | 149 | /** |
147 | * | 150 | * |
148 | * @return is media stream has video | 151 | * @return is media stream has video |
149 | */ | 152 | */ |
150 | bool hasVideo() const; | 153 | bool hasVideo() const; |
151 | 154 | ||
152 | /** | 155 | /** |
153 | * | 156 | * |
154 | */ | 157 | */ |
155 | void setScaling( bool ); | 158 | void setScaling( bool ); |
156 | 159 | ||
157 | /** | 160 | /** |
158 | * Set the Gamma value for video output | 161 | * Set the Gamma value for video output |
159 | * @param int the value between -100 and 100, 0 is original | 162 | * @param int the value between -100 and 100, 0 is original |
160 | */ | 163 | */ |
161 | void setGamma( int ); | 164 | void setGamma( int ); |
162 | 165 | ||
163 | /** | 166 | /** |
164 | * test | 167 | * test |
165 | */ | 168 | */ |
166 | Frame currentFrame() const; | 169 | Frame currentFrame() const; |
167 | 170 | ||
168 | /** | 171 | /** |
169 | * Returns the error code | 172 | * Returns the error code |
170 | * XINE_ERROR_NONE 0 | 173 | * XINE_ERROR_NONE 0 |
171 | * XINE_ERROR_NO_INPUT_PLUGIN 1 | 174 | * XINE_ERROR_NO_INPUT_PLUGIN 1 |
172 | * XINE_ERROR_NO_DEMUXER_PLUGIN 2 | 175 | * XINE_ERROR_NO_DEMUXER_PLUGIN 2 |
173 | * XINE_ERROR_DEMUXER_FAILED 3 | 176 | * XINE_ERROR_DEMUXER_FAILED 3 |
174 | */ | 177 | */ |
175 | int error() const; | 178 | int error() const; |
176 | 179 | ||
177 | signals: | 180 | signals: |
178 | 181 | ||
179 | void stopped(); | 182 | void stopped(); |
180 | 183 | ||
181 | void initialized(); | 184 | void initialized(); |
182 | 185 | ||
183 | protected: | 186 | protected: |
184 | virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); | 187 | virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); |
185 | 188 | ||
189 | virtual void run(); | ||
190 | |||
186 | private: | 191 | private: |
192 | void initialize(); | ||
193 | |||
187 | int m_bytes_per_pixel; | 194 | int m_bytes_per_pixel; |
188 | bool m_video:1; | 195 | bool m_video:1; |
189 | XineVideoWidget *m_wid; | 196 | XineVideoWidget *m_wid; |
190 | xine_t *m_xine; | 197 | xine_t *m_xine; |
191 | xine_stream_t *m_stream; | 198 | xine_stream_t *m_stream; |
192 | xine_cfg_entry_t *m_config; | 199 | xine_cfg_entry_t *m_config; |
193 | xine_vo_driver_t *m_videoOutput; | 200 | xine_vo_driver_t *m_videoOutput; |
194 | xine_ao_driver_t* m_audioOutput; | 201 | xine_ao_driver_t* m_audioOutput; |
195 | xine_event_queue_t *m_queue; | 202 | xine_event_queue_t *m_queue; |
196 | 203 | ||
197 | void handleXineEvent( const xine_event_t* t ); | 204 | void handleXineEvent( const xine_event_t* t ); |
198 | void handleXineEvent( int type ); | 205 | void handleXineEvent( int type ); |
199 | void drawFrame( uint8_t* frame, int width, int height, int bytes ); | 206 | void drawFrame( uint8_t* frame, int width, int height, int bytes ); |
200 | // C -> C++ bridge for the event system | 207 | // C -> C++ bridge for the event system |
201 | static void xine_event_handler( void* user_data, const xine_event_t* t); | 208 | static void xine_event_handler( void* user_data, const xine_event_t* t); |
202 | static void xine_display_frame( void* user_data, uint8_t* frame , | 209 | static void xine_display_frame( void* user_data, uint8_t* frame , |
203 | int width, int height, int bytes ); | 210 | int width, int height, int bytes ); |
204 | }; | 211 | }; |
205 | }; | 212 | }; |
206 | 213 | ||
207 | 214 | ||
208 | #endif | 215 | #endif |
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index efa9934..1aa3daa 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp | |||
@@ -1,269 +1,269 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | 5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; General Public License for more | 22 | ..}^=.= = ; General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = General Public License along with | 26 | -_. . . )=. = General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | 34 | ||
35 | #include <qtimer.h> | 35 | #include <qtimer.h> |
36 | #include <qmessagebox.h> | 36 | #include <qmessagebox.h> |
37 | #include <qpe/qcopenvelope_qws.h> | 37 | #include <qpe/qcopenvelope_qws.h> |
38 | #include <qpe/qpeapplication.h> | 38 | #include <qpe/qpeapplication.h> |
39 | #include "xinecontrol.h" | 39 | #include "xinecontrol.h" |
40 | #include "mediaplayerstate.h" | 40 | #include "mediaplayerstate.h" |
41 | #include "xinevideowidget.h" | 41 | #include "xinevideowidget.h" |
42 | 42 | ||
43 | XineControl::XineControl( XineVideoWidget *xineWidget, | 43 | XineControl::XineControl( XineVideoWidget *xineWidget, |
44 | MediaPlayerState &_mediaPlayerState, | 44 | MediaPlayerState &_mediaPlayerState, |
45 | QObject *parent, const char *name ) | 45 | QObject *parent, const char *name ) |
46 | : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget ) | 46 | : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget ) |
47 | { | 47 | { |
48 | 48 | ||
49 | libXine = new XINE::Lib( xineWidget ); | 49 | libXine = new XINE::Lib( XINE::Lib::InitializeImmediately, xineWidget ); |
50 | 50 | ||
51 | init(); | 51 | init(); |
52 | } | 52 | } |
53 | 53 | ||
54 | XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, | 54 | XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, |
55 | MediaPlayerState &_mediaPlayerState, | 55 | MediaPlayerState &_mediaPlayerState, |
56 | QObject *parent, const char *name ) | 56 | QObject *parent, const char *name ) |
57 | : QObject( parent, name ), libXine( xine ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget ) | 57 | : QObject( parent, name ), libXine( xine ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget ) |
58 | { | 58 | { |
59 | init(); | 59 | init(); |
60 | } | 60 | } |
61 | 61 | ||
62 | void XineControl::init() | 62 | void XineControl::init() |
63 | { | 63 | { |
64 | connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); | 64 | connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); |
65 | connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) ); | 65 | connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) ); |
66 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); | 66 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); |
67 | connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); | 67 | connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); |
68 | connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); | 68 | connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); |
69 | connect( &mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); | 69 | connect( &mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); |
70 | connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); | 70 | connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); |
71 | connect( xineVideoWidget, SIGNAL( videoResized( const QSize & ) ), this, SLOT( videoResized ( const QSize & ) ) ); | 71 | connect( xineVideoWidget, SIGNAL( videoResized( const QSize & ) ), this, SLOT( videoResized ( const QSize & ) ) ); |
72 | 72 | ||
73 | disabledSuspendScreenSaver = FALSE; | 73 | disabledSuspendScreenSaver = FALSE; |
74 | } | 74 | } |
75 | 75 | ||
76 | XineControl::~XineControl() { | 76 | XineControl::~XineControl() { |
77 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 77 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
78 | if ( disabledSuspendScreenSaver ) { | 78 | if ( disabledSuspendScreenSaver ) { |
79 | disabledSuspendScreenSaver = FALSE; | 79 | disabledSuspendScreenSaver = FALSE; |
80 | // Re-enable the suspend mode | 80 | // Re-enable the suspend mode |
81 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; | 81 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; |
82 | } | 82 | } |
83 | #endif | 83 | #endif |
84 | delete libXine; | 84 | delete libXine; |
85 | } | 85 | } |
86 | 86 | ||
87 | void XineControl::play( const QString& fileName ) { | 87 | void XineControl::play( const QString& fileName ) { |
88 | hasVideoChannel = FALSE; | 88 | hasVideoChannel = FALSE; |
89 | hasAudioChannel = FALSE; | 89 | hasAudioChannel = FALSE; |
90 | m_fileName = fileName; | 90 | m_fileName = fileName; |
91 | 91 | ||
92 | qDebug("<<FILENAME: " + fileName + ">>>>"); | 92 | qDebug("<<FILENAME: " + fileName + ">>>>"); |
93 | 93 | ||
94 | if ( !libXine->play( fileName, 0, 0 ) ) { | 94 | if ( !libXine->play( fileName, 0, 0 ) ) { |
95 | QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); | 95 | QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); |
96 | // toggle stop so the the play button is reset | 96 | // toggle stop so the the play button is reset |
97 | mediaPlayerState.setPlaying( false ); | 97 | mediaPlayerState.setPlaying( false ); |
98 | return; | 98 | return; |
99 | } | 99 | } |
100 | mediaPlayerState.setPlaying( true ); | 100 | mediaPlayerState.setPlaying( true ); |
101 | 101 | ||
102 | MediaPlayerState::DisplayType displayType; | 102 | MediaPlayerState::DisplayType displayType; |
103 | // qDebug( QString( "libXine->hasVideo() return : %1 ").arg( libXine->hasVideo() ) ); | 103 | // qDebug( QString( "libXine->hasVideo() return : %1 ").arg( libXine->hasVideo() ) ); |
104 | if ( !libXine->hasVideo() ) { | 104 | if ( !libXine->hasVideo() ) { |
105 | displayType = MediaPlayerState::Audio; | 105 | displayType = MediaPlayerState::Audio; |
106 | qDebug("HAS AUDIO"); | 106 | qDebug("HAS AUDIO"); |
107 | libXine->setShowVideo( false ); | 107 | libXine->setShowVideo( false ); |
108 | hasAudioChannel = TRUE; | 108 | hasAudioChannel = TRUE; |
109 | } else { | 109 | } else { |
110 | displayType = MediaPlayerState::Video; | 110 | displayType = MediaPlayerState::Video; |
111 | qDebug("HAS VIDEO"); | 111 | qDebug("HAS VIDEO"); |
112 | libXine->setShowVideo( true ); | 112 | libXine->setShowVideo( true ); |
113 | hasVideoChannel = TRUE; | 113 | hasVideoChannel = TRUE; |
114 | } | 114 | } |
115 | // determine if slider is shown | 115 | // determine if slider is shown |
116 | mediaPlayerState.setIsSeekable( libXine->isSeekable() ); | 116 | mediaPlayerState.setIsSeekable( libXine->isSeekable() ); |
117 | 117 | ||
118 | // which gui (video / audio) | 118 | // which gui (video / audio) |
119 | mediaPlayerState.setDisplayType( displayType ); | 119 | mediaPlayerState.setDisplayType( displayType ); |
120 | 120 | ||
121 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 121 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
122 | if ( !disabledSuspendScreenSaver ) { | 122 | if ( !disabledSuspendScreenSaver ) { |
123 | disabledSuspendScreenSaver = TRUE; | 123 | disabledSuspendScreenSaver = TRUE; |
124 | // Stop the screen from blanking and power saving state | 124 | // Stop the screen from blanking and power saving state |
125 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) | 125 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) |
126 | << ( displayType == MediaPlayerState::Video ? QPEApplication::Disable : QPEApplication::DisableSuspend ); | 126 | << ( displayType == MediaPlayerState::Video ? QPEApplication::Disable : QPEApplication::DisableSuspend ); |
127 | } | 127 | } |
128 | #endif | 128 | #endif |
129 | 129 | ||
130 | length(); | 130 | length(); |
131 | position(); | 131 | position(); |
132 | } | 132 | } |
133 | 133 | ||
134 | void XineControl::nextMedia() { | 134 | void XineControl::nextMedia() { |
135 | mediaPlayerState.setNext(); | 135 | mediaPlayerState.setNext(); |
136 | } | 136 | } |
137 | 137 | ||
138 | void XineControl::setGamma( int value ) { | 138 | void XineControl::setGamma( int value ) { |
139 | libXine->setGamma( value ); | 139 | libXine->setGamma( value ); |
140 | } | 140 | } |
141 | 141 | ||
142 | void XineControl::stop( bool isSet ) { | 142 | void XineControl::stop( bool isSet ) { |
143 | if ( !isSet ) { | 143 | if ( !isSet ) { |
144 | libXine->stop(); | 144 | libXine->stop(); |
145 | 145 | ||
146 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 146 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
147 | if ( disabledSuspendScreenSaver ) { | 147 | if ( disabledSuspendScreenSaver ) { |
148 | disabledSuspendScreenSaver = FALSE; | 148 | disabledSuspendScreenSaver = FALSE; |
149 | // Re-enable the suspend mode | 149 | // Re-enable the suspend mode |
150 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; | 150 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; |
151 | } | 151 | } |
152 | #endif | 152 | #endif |
153 | } | 153 | } |
154 | } | 154 | } |
155 | 155 | ||
156 | /** | 156 | /** |
157 | * Pause playback | 157 | * Pause playback |
158 | * @isSet | 158 | * @isSet |
159 | */ | 159 | */ |
160 | void XineControl::pause( bool isSet) { | 160 | void XineControl::pause( bool isSet) { |
161 | libXine->pause( isSet ); | 161 | libXine->pause( isSet ); |
162 | } | 162 | } |
163 | 163 | ||
164 | 164 | ||
165 | /** | 165 | /** |
166 | * get current time in playback | 166 | * get current time in playback |
167 | */ | 167 | */ |
168 | long XineControl::currentTime() { | 168 | long XineControl::currentTime() { |
169 | // todo: jede sekunde überprüfen | 169 | // todo: jede sekunde überprüfen |
170 | m_currentTime = libXine->currentTime(); | 170 | m_currentTime = libXine->currentTime(); |
171 | return m_currentTime; | 171 | return m_currentTime; |
172 | QTimer::singleShot( 1000, this, SLOT( currentTime() ) ); | 172 | QTimer::singleShot( 1000, this, SLOT( currentTime() ) ); |
173 | } | 173 | } |
174 | 174 | ||
175 | /** | 175 | /** |
176 | * Set the length of the media file | 176 | * Set the length of the media file |
177 | */ | 177 | */ |
178 | void XineControl::length() { | 178 | void XineControl::length() { |
179 | m_length = libXine->length(); | 179 | m_length = libXine->length(); |
180 | mediaPlayerState.setLength( m_length ); | 180 | mediaPlayerState.setLength( m_length ); |
181 | } | 181 | } |
182 | 182 | ||
183 | 183 | ||
184 | /** | 184 | /** |
185 | * Reports the position the xine backend is at right now | 185 | * Reports the position the xine backend is at right now |
186 | * @return long the postion in seconds | 186 | * @return long the postion in seconds |
187 | */ | 187 | */ |
188 | long XineControl::position() { | 188 | long XineControl::position() { |
189 | m_position = ( currentTime() ); | 189 | m_position = ( currentTime() ); |
190 | mediaPlayerState.updatePosition( m_position ); | 190 | mediaPlayerState.updatePosition( m_position ); |
191 | long emitPos = (long)m_position; | 191 | long emitPos = (long)m_position; |
192 | emit positionChanged( emitPos ); | 192 | emit positionChanged( emitPos ); |
193 | if( mediaPlayerState.isPlaying() ) { | 193 | if( mediaPlayerState.isPlaying() ) { |
194 | // needs to be stopped the media is stopped | 194 | // needs to be stopped the media is stopped |
195 | QTimer::singleShot( 1000, this, SLOT( position() ) ); | 195 | QTimer::singleShot( 1000, this, SLOT( position() ) ); |
196 | } | 196 | } |
197 | // qDebug("POSITION : %d", m_position); | 197 | // qDebug("POSITION : %d", m_position); |
198 | return m_position; | 198 | return m_position; |
199 | } | 199 | } |
200 | 200 | ||
201 | /** | 201 | /** |
202 | * Set videoplayback to fullscreen | 202 | * Set videoplayback to fullscreen |
203 | * @param isSet | 203 | * @param isSet |
204 | */ | 204 | */ |
205 | void XineControl::setFullscreen( bool isSet ) { | 205 | void XineControl::setFullscreen( bool isSet ) { |
206 | libXine->showVideoFullScreen( isSet ); | 206 | libXine->showVideoFullScreen( isSet ); |
207 | } | 207 | } |
208 | 208 | ||
209 | 209 | ||
210 | QString XineControl::getMetaInfo() { | 210 | QString XineControl::getMetaInfo() { |
211 | 211 | ||
212 | QString returnString; | 212 | QString returnString; |
213 | 213 | ||
214 | if ( !libXine->metaInfo( 0 ).isEmpty() ) { | 214 | if ( !libXine->metaInfo( 0 ).isEmpty() ) { |
215 | returnString += tr( " Title: " + libXine->metaInfo( 0 ) ); | 215 | returnString += tr( " Title: " + libXine->metaInfo( 0 ) ); |
216 | } | 216 | } |
217 | 217 | ||
218 | if ( !libXine->metaInfo( 1 ).isEmpty() ) { | 218 | if ( !libXine->metaInfo( 1 ).isEmpty() ) { |
219 | returnString += tr( " Comment: " + libXine->metaInfo( 1 ) ); | 219 | returnString += tr( " Comment: " + libXine->metaInfo( 1 ) ); |
220 | } | 220 | } |
221 | 221 | ||
222 | if ( !libXine->metaInfo( 2 ).isEmpty() ) { | 222 | if ( !libXine->metaInfo( 2 ).isEmpty() ) { |
223 | returnString += tr( " Artist: " + libXine->metaInfo( 2 ) ); | 223 | returnString += tr( " Artist: " + libXine->metaInfo( 2 ) ); |
224 | } | 224 | } |
225 | 225 | ||
226 | if ( !libXine->metaInfo( 3 ).isEmpty() ) { | 226 | if ( !libXine->metaInfo( 3 ).isEmpty() ) { |
227 | returnString += tr( " Genre: " + libXine->metaInfo( 3 ) ); | 227 | returnString += tr( " Genre: " + libXine->metaInfo( 3 ) ); |
228 | } | 228 | } |
229 | 229 | ||
230 | if ( !libXine->metaInfo( 4 ).isEmpty() ) { | 230 | if ( !libXine->metaInfo( 4 ).isEmpty() ) { |
231 | returnString += tr( " Album: " + libXine->metaInfo( 4 ) ); | 231 | returnString += tr( " Album: " + libXine->metaInfo( 4 ) ); |
232 | } | 232 | } |
233 | 233 | ||
234 | if ( !libXine->metaInfo( 5 ).isEmpty() ) { | 234 | if ( !libXine->metaInfo( 5 ).isEmpty() ) { |
235 | returnString += tr( " Year: " + libXine->metaInfo( 5 ) ); | 235 | returnString += tr( " Year: " + libXine->metaInfo( 5 ) ); |
236 | } | 236 | } |
237 | return returnString; | 237 | return returnString; |
238 | } | 238 | } |
239 | 239 | ||
240 | QString XineControl::getErrorCode() { | 240 | QString XineControl::getErrorCode() { |
241 | 241 | ||
242 | int errorCode = libXine->error(); | 242 | int errorCode = libXine->error(); |
243 | 243 | ||
244 | qDebug( QString("ERRORCODE: %1 ").arg(errorCode) ); | 244 | qDebug( QString("ERRORCODE: %1 ").arg(errorCode) ); |
245 | 245 | ||
246 | if ( errorCode == 1 ) { | 246 | if ( errorCode == 1 ) { |
247 | return tr( "No input plugin found for this media type" ); | 247 | return tr( "No input plugin found for this media type" ); |
248 | } else if ( errorCode == 2 ) { | 248 | } else if ( errorCode == 2 ) { |
249 | return tr( "No demux plugin found for this media type" ); | 249 | return tr( "No demux plugin found for this media type" ); |
250 | } else if ( errorCode == 3 ) { | 250 | } else if ( errorCode == 3 ) { |
251 | return tr( "Demuxing failed for this media type" ); | 251 | return tr( "Demuxing failed for this media type" ); |
252 | } else if ( errorCode == 4 ) { | 252 | } else if ( errorCode == 4 ) { |
253 | return tr( "Malformed MRL" ); | 253 | return tr( "Malformed MRL" ); |
254 | } else { | 254 | } else { |
255 | return tr( "Some other error" ); | 255 | return tr( "Some other error" ); |
256 | } | 256 | } |
257 | } | 257 | } |
258 | 258 | ||
259 | /** | 259 | /** |
260 | * Seek to a position in the track | 260 | * Seek to a position in the track |
261 | * @param second the second to jump to | 261 | * @param second the second to jump to |
262 | */ | 262 | */ |
263 | void XineControl::seekTo( long second ) { | 263 | void XineControl::seekTo( long second ) { |
264 | libXine->seekTo( (int)second ); | 264 | libXine->seekTo( (int)second ); |
265 | } | 265 | } |
266 | 266 | ||
267 | void XineControl::videoResized ( const QSize &s ) { | 267 | void XineControl::videoResized ( const QSize &s ) { |
268 | libXine->resize( s ); | 268 | libXine->resize( s ); |
269 | } | 269 | } |