author | harlekin <harlekin> | 2002-09-02 17:18:30 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-02 17:18:30 (UTC) |
commit | 99b610f06af444e2636d1afe93d3de89a524ee8a (patch) (unidiff) | |
tree | a664829bd5149686b906253f71d4cc01eeb9b059 /noncore | |
parent | bf0f423d8aed59da90db9e9748a53fdd5e1efab0 (diff) | |
download | opie-99b610f06af444e2636d1afe93d3de89a524ee8a.zip opie-99b610f06af444e2636d1afe93d3de89a524ee8a.tar.gz opie-99b610f06af444e2636d1afe93d3de89a524ee8a.tar.bz2 |
first parts of gamma correction, fullscreen on arm need some more work
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 48 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 43 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.h | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | 23 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.h | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 11 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.h | 31 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 0 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/yuv2rgb.c | 1 |
13 files changed, 178 insertions, 22 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index b2143a0..748ae1f 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -39,48 +39,49 @@ | |||
39 | 39 | ||
40 | #include <qfile.h> | 40 | #include <qfile.h> |
41 | 41 | ||
42 | #include <qgfx_qws.h> | 42 | #include <qgfx_qws.h> |
43 | #include <qdirectpainter_qws.h> | 43 | #include <qdirectpainter_qws.h> |
44 | 44 | ||
45 | #include "xinevideowidget.h" | 45 | #include "xinevideowidget.h" |
46 | #include "frame.h" | 46 | #include "frame.h" |
47 | #include "lib.h" | 47 | #include "lib.h" |
48 | 48 | ||
49 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | 49 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, |
50 | int width, int height,int bytes ); | 50 | int width, int height,int bytes ); |
51 | 51 | ||
52 | extern "C" { | 52 | extern "C" { |
53 | vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video); | 53 | vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video); |
54 | int null_is_showing_video( vo_driver_t* self ); | 54 | int null_is_showing_video( vo_driver_t* self ); |
55 | void null_set_show_video( vo_driver_t* self, int show ); | 55 | void null_set_show_video( vo_driver_t* self, int show ); |
56 | int null_is_fullscreen( vo_driver_t* self ); | 56 | int null_is_fullscreen( vo_driver_t* self ); |
57 | void null_set_fullscreen( vo_driver_t* self, int screen ); | 57 | void null_set_fullscreen( vo_driver_t* self, int screen ); |
58 | int null_is_scaling( vo_driver_t* self ); | 58 | int null_is_scaling( vo_driver_t* self ); |
59 | void null_set_scaling( vo_driver_t* self, int scale ); | 59 | void null_set_scaling( vo_driver_t* self, int scale ); |
60 | void null_set_gui_width( vo_driver_t* self, int width ); | 60 | void null_set_gui_width( vo_driver_t* self, int width ); |
61 | void null_set_gui_height( vo_driver_t* self, int height ); | 61 | void null_set_gui_height( vo_driver_t* self, int height ); |
62 | void null_set_mode( vo_driver_t* self, int depth, int rgb ); | 62 | void null_set_mode( vo_driver_t* self, int depth, int rgb ); |
63 | void null_set_videoGamma( vo_driver_t* self , int value ); | ||
63 | void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data); | 64 | void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data); |
64 | } | 65 | } |
65 | 66 | ||
66 | using namespace XINE; | 67 | using namespace XINE; |
67 | 68 | ||
68 | Lib::Lib(XineVideoWidget* widget) { | 69 | Lib::Lib(XineVideoWidget* widget) { |
69 | m_video = false; | 70 | m_video = false; |
70 | m_wid = widget; | 71 | m_wid = widget; |
71 | printf("Lib"); | 72 | printf("Lib"); |
72 | QCString str( getenv("HOME") ); | 73 | QCString str( getenv("HOME") ); |
73 | str += "/Settings/opiexine.cf"; | 74 | str += "/Settings/opiexine.cf"; |
74 | // get the configuration | 75 | // get the configuration |
75 | 76 | ||
76 | // not really OO, should be an extra class, later | 77 | // not really OO, should be an extra class, later |
77 | if ( !QFile(str).exists() ) { | 78 | if ( !QFile(str).exists() ) { |
78 | QFile f(str); | 79 | QFile f(str); |
79 | f.open(IO_WriteOnly); | 80 | f.open(IO_WriteOnly); |
80 | QTextStream ts( &f ); | 81 | QTextStream ts( &f ); |
81 | ts << "misc.memcpy_method:glibc\n"; | 82 | ts << "misc.memcpy_method:glibc\n"; |
82 | f.close(); | 83 | f.close(); |
83 | } | 84 | } |
84 | 85 | ||
85 | m_config = xine_config_file_init( str.data() ); | 86 | m_config = xine_config_file_init( str.data() ); |
86 | 87 | ||
@@ -182,46 +183,52 @@ Frame Lib::currentFrame() { | |||
182 | }; | 183 | }; |
183 | int Lib::error() { | 184 | int Lib::error() { |
184 | return xine_get_error( m_xine ); | 185 | return xine_get_error( m_xine ); |
185 | }; | 186 | }; |
186 | void Lib::handleXineEvent( xine_event_t* t ) { | 187 | void Lib::handleXineEvent( xine_event_t* t ) { |
187 | if ( t->type == XINE_EVENT_PLAYBACK_FINISHED ) | 188 | if ( t->type == XINE_EVENT_PLAYBACK_FINISHED ) |
188 | emit stopped(); | 189 | emit stopped(); |
189 | } | 190 | } |
190 | void Lib::setShowVideo( bool video ) { | 191 | void Lib::setShowVideo( bool video ) { |
191 | m_video = video; | 192 | m_video = video; |
192 | ::null_set_show_video( m_videoOutput, video ); | 193 | ::null_set_show_video( m_videoOutput, video ); |
193 | } | 194 | } |
194 | bool Lib::isShowingVideo() { | 195 | bool Lib::isShowingVideo() { |
195 | return ::null_is_showing_video( m_videoOutput ); | 196 | return ::null_is_showing_video( m_videoOutput ); |
196 | } | 197 | } |
197 | void Lib::showVideoFullScreen( bool fullScreen ) { | 198 | void Lib::showVideoFullScreen( bool fullScreen ) { |
198 | ::null_set_fullscreen( m_videoOutput, fullScreen ); | 199 | ::null_set_fullscreen( m_videoOutput, fullScreen ); |
199 | } | 200 | } |
200 | bool Lib::isVideoFullScreen() { | 201 | bool Lib::isVideoFullScreen() { |
201 | return ::null_is_fullscreen( m_videoOutput ); | 202 | return ::null_is_fullscreen( m_videoOutput ); |
202 | } | 203 | } |
203 | void Lib::setScaling( bool scale ) { | 204 | void Lib::setScaling( bool scale ) { |
204 | ::null_set_scaling( m_videoOutput, scale ); | 205 | ::null_set_scaling( m_videoOutput, scale ); |
205 | } | 206 | } |
207 | |||
208 | void Lib::setGamma( int value ) { | ||
209 | //qDebug( QString( "%1").arg(value) ); | ||
210 | ::null_set_videoGamma( m_videoOutput, value ); | ||
211 | } | ||
212 | |||
206 | bool Lib::isScaling() { | 213 | bool Lib::isScaling() { |
207 | return ::null_is_scaling( m_videoOutput ); | 214 | return ::null_is_scaling( m_videoOutput ); |
208 | } | 215 | } |
209 | void Lib::xine_event_handler( void* user_data, xine_event_t* t ) { | 216 | void Lib::xine_event_handler( void* user_data, xine_event_t* t ) { |
210 | ((Lib*)user_data)->handleXineEvent( t ); | 217 | ((Lib*)user_data)->handleXineEvent( t ); |
211 | } | 218 | } |
212 | void Lib::xine_display_frame( void* user_data, uint8_t *frame, | 219 | void Lib::xine_display_frame( void* user_data, uint8_t *frame, |
213 | int width, int height, int bytes ) { | 220 | int width, int height, int bytes ) { |
214 | 221 | ||
215 | ((Lib*)user_data)->drawFrame( frame, width, height, bytes ); | 222 | ((Lib*)user_data)->drawFrame( frame, width, height, bytes ); |
216 | } | 223 | } |
217 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { | 224 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { |
218 | if (!m_video ) { | 225 | if (!m_video ) { |
219 | qWarning("not showing video now"); | 226 | qWarning("not showing video now"); |
220 | return; | 227 | return; |
221 | } | 228 | } |
222 | // qWarning("called draw frame %d %d", width, height); | 229 | // qWarning("called draw frame %d %d", width, height); |
223 | 230 | ||
224 | m_wid->setImage( frame, width, height, bytes ); | 231 | m_wid->setImage( frame, width, height, bytes ); |
225 | // m_wid->repaint(false); | 232 | // m_wid->repaint(false); |
226 | 233 | ||
227 | } | 234 | } |
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index abd8c65..b9d0a8a 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h | |||
@@ -91,48 +91,55 @@ namespace XINE { | |||
91 | /** | 91 | /** |
92 | * is we show video | 92 | * is we show video |
93 | */ | 93 | */ |
94 | bool isShowingVideo() /*const*/; | 94 | bool isShowingVideo() /*const*/; |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * | 97 | * |
98 | */ | 98 | */ |
99 | void showVideoFullScreen( bool fullScreen ); | 99 | void showVideoFullScreen( bool fullScreen ); |
100 | 100 | ||
101 | /** | 101 | /** |
102 | * | 102 | * |
103 | */ | 103 | */ |
104 | bool isVideoFullScreen()/*const*/ ; | 104 | bool isVideoFullScreen()/*const*/ ; |
105 | 105 | ||
106 | /** | 106 | /** |
107 | * | 107 | * |
108 | */ | 108 | */ |
109 | bool isScaling(); | 109 | bool isScaling(); |
110 | 110 | ||
111 | /** | 111 | /** |
112 | * | 112 | * |
113 | */ | 113 | */ |
114 | void setScaling( bool ); | 114 | void setScaling( bool ); |
115 | |||
116 | /** | ||
117 | * Set the Gamma value for video output | ||
118 | * @param int the value between -100 and 100, 0 is original | ||
119 | */ | ||
120 | void setGamma( int ); | ||
121 | |||
115 | /** | 122 | /** |
116 | * test | 123 | * test |
117 | */ | 124 | */ |
118 | Frame currentFrame()/*const*/; | 125 | Frame currentFrame()/*const*/; |
119 | 126 | ||
120 | /** | 127 | /** |
121 | * Returns the error code | 128 | * Returns the error code |
122 | */ | 129 | */ |
123 | int error() /*const*/; | 130 | int error() /*const*/; |
124 | 131 | ||
125 | signals: | 132 | signals: |
126 | void stopped(); | 133 | void stopped(); |
127 | private: | 134 | private: |
128 | int m_bytes_per_pixel; | 135 | int m_bytes_per_pixel; |
129 | bool m_video:1; | 136 | bool m_video:1; |
130 | XineVideoWidget *m_wid; | 137 | XineVideoWidget *m_wid; |
131 | xine_t *m_xine; | 138 | xine_t *m_xine; |
132 | config_values_t *m_config; | 139 | config_values_t *m_config; |
133 | vo_driver_t *m_videoOutput; | 140 | vo_driver_t *m_videoOutput; |
134 | ao_driver_t* m_audioOutput; | 141 | ao_driver_t* m_audioOutput; |
135 | 142 | ||
136 | void handleXineEvent( xine_event_t* t ); | 143 | void handleXineEvent( xine_event_t* t ); |
137 | void drawFrame( uint8_t* frame, int width, int height, int bytes ); | 144 | void drawFrame( uint8_t* frame, int width, int height, int bytes ); |
138 | // C -> C++ bridge for the event system | 145 | // C -> C++ bridge for the event system |
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index d984022..4ec5989 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp | |||
@@ -1,77 +1,111 @@ | |||
1 | /* | ||
2 | This file is part of the Opie Project | ||
3 | |||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | ||
5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | ||
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | ||
7 | =. | ||
8 | .=l. | ||
9 | .>+-= | ||
10 | _;:, .> :=|. This program is free software; you can | ||
11 | .> <`_, > . <= redistribute it and/or modify it under | ||
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
13 | .="- .-=="i, .._ License as published by the Free Software | ||
14 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
15 | ._= =} : or (at your option) any later version. | ||
16 | .%`+i> _;_. | ||
17 | .i_,=:_. -<s. This program is distributed in the hope that | ||
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
19 | : .. .:, . . . without even the implied warranty of | ||
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
22 | ..}^=.= = ; General Public License for more | ||
23 | ++= -. .` .: details. | ||
24 | : = ...= . :.=- | ||
25 | -. .:....=;==+<; You should have received a copy of the GNU | ||
26 | -_. . . )=. = General Public License along with | ||
27 | -- :-=` this library; see the file COPYING.LIB. | ||
28 | If not, write to the Free Software Foundation, | ||
29 | Inc., 59 Temple Place - Suite 330, | ||
30 | Boston, MA 02111-1307, USA. | ||
31 | |||
32 | */ | ||
33 | |||
34 | // this file is based on work by trolltech | ||
35 | |||
1 | #include <qpe/qpeapplication.h> | 36 | #include <qpe/qpeapplication.h> |
2 | #include <qpe/qlibrary.h> | 37 | #include <qpe/qlibrary.h> |
3 | #include <qpe/config.h> | 38 | #include <qpe/config.h> |
4 | #include <qvaluelist.h> | 39 | #include <qvaluelist.h> |
5 | #include <qobject.h> | 40 | #include <qobject.h> |
6 | #include <qdir.h> | 41 | #include <qdir.h> |
7 | #include "mediaplayerstate.h" | 42 | #include "mediaplayerstate.h" |
8 | 43 | ||
9 | 44 | ||
10 | 45 | ||
11 | //#define MediaPlayerDebug(x) qDebug x | 46 | //#define MediaPlayerDebug(x) qDebug x |
12 | #define MediaPlayerDebug(x) | 47 | #define MediaPlayerDebug(x) |
13 | 48 | ||
14 | 49 | ||
15 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) | 50 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) |
16 | : QObject( parent, name ) { | 51 | : QObject( parent, name ) { |
17 | Config cfg( "OpiePlayer" ); | 52 | Config cfg( "OpiePlayer" ); |
18 | readConfig( cfg ); | 53 | readConfig( cfg ); |
19 | isStreaming = false; | 54 | isStreaming = false; |
20 | } | 55 | } |
21 | 56 | ||
22 | 57 | ||
23 | MediaPlayerState::~MediaPlayerState() { | 58 | MediaPlayerState::~MediaPlayerState() { |
24 | // Config cfg( "OpiePlayer" ); | ||
25 | // writeConfig( cfg ); | ||
26 | |||
27 | } | 59 | } |
28 | 60 | ||
29 | 61 | ||
30 | void MediaPlayerState::readConfig( Config& cfg ) { | 62 | void MediaPlayerState::readConfig( Config& cfg ) { |
31 | cfg.setGroup("Options"); | 63 | cfg.setGroup("Options"); |
32 | isFullscreen = cfg.readBoolEntry( "FullScreen" ); | 64 | isFullscreen = cfg.readBoolEntry( "FullScreen" ); |
33 | isScaled = cfg.readBoolEntry( "Scaling" ); | 65 | isScaled = cfg.readBoolEntry( "Scaling" ); |
34 | isLooping = cfg.readBoolEntry( "Looping" ); | 66 | isLooping = cfg.readBoolEntry( "Looping" ); |
35 | isShuffled = cfg.readBoolEntry( "Shuffle" ); | 67 | isShuffled = cfg.readBoolEntry( "Shuffle" ); |
36 | usePlaylist = cfg.readBoolEntry( "UsePlayList" ); | 68 | usePlaylist = cfg.readBoolEntry( "UsePlayList" ); |
69 | videoGamma = cfg.readNumEntry( "VideoGamma" ); | ||
37 | usePlaylist = TRUE; | 70 | usePlaylist = TRUE; |
38 | isPlaying = FALSE; | 71 | isPlaying = FALSE; |
39 | isStreaming = FALSE; | 72 | isStreaming = FALSE; |
40 | isPaused = FALSE; | 73 | isPaused = FALSE; |
41 | curPosition = 0; | 74 | curPosition = 0; |
42 | curLength = 0; | 75 | curLength = 0; |
43 | curView = 'l'; | 76 | curView = 'l'; |
44 | } | 77 | } |
45 | 78 | ||
46 | 79 | ||
47 | void MediaPlayerState::writeConfig( Config& cfg ) const { | 80 | void MediaPlayerState::writeConfig( Config& cfg ) const { |
48 | cfg.setGroup("Options"); | 81 | cfg.setGroup("Options"); |
49 | cfg.writeEntry("FullScreen", isFullscreen ); | 82 | cfg.writeEntry("FullScreen", isFullscreen ); |
50 | cfg.writeEntry("Scaling", isScaled ); | 83 | cfg.writeEntry("Scaling", isScaled ); |
51 | cfg.writeEntry("Looping", isLooping ); | 84 | cfg.writeEntry("Looping", isLooping ); |
52 | cfg.writeEntry("Shuffle", isShuffled ); | 85 | cfg.writeEntry("Shuffle", isShuffled ); |
53 | cfg.writeEntry("UsePlayList", usePlaylist ); | 86 | cfg.writeEntry("UsePlayList", usePlaylist ); |
87 | cfg.writeEntry( "VideoGamma", videoGamma ); | ||
54 | } | 88 | } |
55 | 89 | ||
56 | 90 | ||
57 | // public stuff | 91 | // public stuff |
58 | 92 | ||
59 | 93 | ||
60 | bool MediaPlayerState::streaming() { | 94 | bool MediaPlayerState::streaming() { |
61 | return isStreaming; | 95 | return isStreaming; |
62 | } | 96 | } |
63 | 97 | ||
64 | bool MediaPlayerState::fullscreen() { | 98 | bool MediaPlayerState::fullscreen() { |
65 | return isFullscreen; | 99 | return isFullscreen; |
66 | } | 100 | } |
67 | 101 | ||
68 | bool MediaPlayerState::scaled() { | 102 | bool MediaPlayerState::scaled() { |
69 | return isScaled; | 103 | return isScaled; |
70 | } | 104 | } |
71 | 105 | ||
72 | bool MediaPlayerState::looping() { | 106 | bool MediaPlayerState::looping() { |
73 | return isLooping; | 107 | return isLooping; |
74 | } | 108 | } |
75 | 109 | ||
76 | bool MediaPlayerState::shuffled() { | 110 | bool MediaPlayerState::shuffled() { |
77 | return isShuffled; | 111 | return isShuffled; |
@@ -188,48 +222,56 @@ void MediaPlayerState::setPlaying( bool b ) { | |||
188 | void MediaPlayerState::setStop( bool b ) { | 222 | void MediaPlayerState::setStop( bool b ) { |
189 | if ( isStoped == b ) { | 223 | if ( isStoped == b ) { |
190 | return; | 224 | return; |
191 | } | 225 | } |
192 | isStoped = b; | 226 | isStoped = b; |
193 | emit stopToggled(b); | 227 | emit stopToggled(b); |
194 | } | 228 | } |
195 | 229 | ||
196 | void MediaPlayerState::setPosition( long p ) { | 230 | void MediaPlayerState::setPosition( long p ) { |
197 | if ( curPosition == p ) { | 231 | if ( curPosition == p ) { |
198 | return; | 232 | return; |
199 | } | 233 | } |
200 | curPosition = p; | 234 | curPosition = p; |
201 | emit positionChanged(p); | 235 | emit positionChanged(p); |
202 | } | 236 | } |
203 | 237 | ||
204 | void MediaPlayerState::updatePosition( long p ){ | 238 | void MediaPlayerState::updatePosition( long p ){ |
205 | if ( curPosition == p ) { | 239 | if ( curPosition == p ) { |
206 | return; | 240 | return; |
207 | } | 241 | } |
208 | curPosition = p; | 242 | curPosition = p; |
209 | emit positionUpdated(p); | 243 | emit positionUpdated(p); |
210 | } | 244 | } |
211 | 245 | ||
246 | void MediaPlayerState::setVideoGamma( int v ){ | ||
247 | if ( videoGamma == v ) { | ||
248 | return; | ||
249 | } | ||
250 | videoGamma = v; | ||
251 | emit videoGammaChanged( v ); | ||
252 | } | ||
253 | |||
212 | void MediaPlayerState::setLength( long l ) { | 254 | void MediaPlayerState::setLength( long l ) { |
213 | if ( curLength == l ) { | 255 | if ( curLength == l ) { |
214 | return; | 256 | return; |
215 | } | 257 | } |
216 | curLength = l; | 258 | curLength = l; |
217 | emit lengthChanged(l); | 259 | emit lengthChanged(l); |
218 | } | 260 | } |
219 | 261 | ||
220 | void MediaPlayerState::setView( char v ) { | 262 | void MediaPlayerState::setView( char v ) { |
221 | if ( curView == v ) { | 263 | if ( curView == v ) { |
222 | return; | 264 | return; |
223 | } | 265 | } |
224 | curView = v; | 266 | curView = v; |
225 | emit viewChanged(v); | 267 | emit viewChanged(v); |
226 | } | 268 | } |
227 | 269 | ||
228 | void MediaPlayerState::setPrev(){ | 270 | void MediaPlayerState::setPrev(){ |
229 | emit prev(); | 271 | emit prev(); |
230 | } | 272 | } |
231 | 273 | ||
232 | void MediaPlayerState::setNext() { | 274 | void MediaPlayerState::setNext() { |
233 | emit next(); | 275 | emit next(); |
234 | } | 276 | } |
235 | 277 | ||
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index 215a2a8..4fef8e0 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h | |||
@@ -1,135 +1,139 @@ | |||
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 | ..}^=.= = ; Library 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 | -_. . . )=. = Library 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 | // this file is based on work by trolltech | ||
35 | |||
34 | #ifndef MEDIA_PLAYER_STATE_H | 36 | #ifndef MEDIA_PLAYER_STATE_H |
35 | #define MEDIA_PLAYER_STATE_H | 37 | #define MEDIA_PLAYER_STATE_H |
36 | 38 | ||
37 | 39 | ||
38 | #include <qobject.h> | 40 | #include <qobject.h> |
39 | 41 | ||
40 | 42 | ||
41 | class MediaPlayerDecoder; | 43 | class MediaPlayerDecoder; |
42 | class Config; | 44 | class Config; |
43 | 45 | ||
44 | 46 | ||
45 | class MediaPlayerState : public QObject { | 47 | class MediaPlayerState : public QObject { |
46 | Q_OBJECT | 48 | Q_OBJECT |
47 | public: | 49 | public: |
48 | MediaPlayerState( QObject *parent, const char *name ); | 50 | MediaPlayerState( QObject *parent, const char *name ); |
49 | ~MediaPlayerState(); | 51 | ~MediaPlayerState(); |
50 | 52 | ||
51 | bool isPaused; | 53 | bool isPaused; |
52 | bool isPlaying; | 54 | bool isPlaying; |
53 | bool isStoped; | 55 | bool isStoped; |
54 | bool streaming(); | 56 | bool streaming(); |
55 | bool fullscreen(); | 57 | bool fullscreen(); |
56 | bool scaled(); | 58 | bool scaled(); |
57 | bool looping(); | 59 | bool looping(); |
58 | bool shuffled(); | 60 | bool shuffled(); |
59 | bool playlist(); | 61 | bool playlist(); |
60 | bool paused(); | 62 | bool paused(); |
61 | bool playing(); | 63 | bool playing(); |
62 | bool stop(); | 64 | bool stop(); |
63 | long position(); | 65 | long position(); |
64 | long length(); | 66 | long length(); |
65 | char view(); | 67 | char view(); |
66 | 68 | ||
67 | public slots: | 69 | public slots: |
68 | void setIsStreaming( bool b ); | 70 | void setIsStreaming( bool b ); |
69 | void setFullscreen( bool b ); | 71 | void setFullscreen( bool b ); |
70 | void setScaled( bool b ); | 72 | void setScaled( bool b ); |
71 | void setLooping( bool b ); | 73 | void setLooping( bool b ); |
72 | void setShuffled( bool b ); | 74 | void setShuffled( bool b ); |
73 | void setPlaylist( bool b ); | 75 | void setPlaylist( bool b ); |
74 | void setPaused( bool b ); | 76 | void setPaused( bool b ); |
75 | void setPlaying( bool b ); | 77 | void setPlaying( bool b ); |
76 | void setStop( bool b ); | 78 | void setStop( bool b ); |
77 | void setPosition( long p ); | 79 | void setPosition( long p ); |
78 | void updatePosition( long p ); | 80 | void updatePosition( long p ); |
79 | void setLength( long l ); | 81 | void setLength( long l ); |
80 | void setView( char v ); | 82 | void setView( char v ); |
81 | void setBlanked( bool b ); | 83 | void setBlanked( bool b ); |
84 | void setVideoGamma( int v ); | ||
82 | 85 | ||
83 | void setPrev(); | 86 | void setPrev(); |
84 | void setNext(); | 87 | void setNext(); |
85 | void setList(); | 88 | void setList(); |
86 | void setVideo(); | 89 | void setVideo(); |
87 | void setAudio(); | 90 | void setAudio(); |
88 | 91 | ||
89 | void toggleFullscreen(); | 92 | void toggleFullscreen(); |
90 | void toggleScaled(); | 93 | void toggleScaled(); |
91 | void toggleLooping(); | 94 | void toggleLooping(); |
92 | void toggleShuffled(); | 95 | void toggleShuffled(); |
93 | void togglePlaylist(); | 96 | void togglePlaylist(); |
94 | void togglePaused(); | 97 | void togglePaused(); |
95 | void togglePlaying(); | 98 | void togglePlaying(); |
96 | void toggleBlank(); | 99 | void toggleBlank(); |
97 | void writeConfig( Config& cfg ) const; | 100 | void writeConfig( Config& cfg ) const; |
98 | 101 | ||
99 | 102 | ||
100 | signals: | 103 | signals: |
101 | void fullscreenToggled( bool ); | 104 | void fullscreenToggled( bool ); |
102 | void scaledToggled( bool ); | 105 | void scaledToggled( bool ); |
103 | void loopingToggled( bool ); | 106 | void loopingToggled( bool ); |
104 | void shuffledToggled( bool ); | 107 | void shuffledToggled( bool ); |
105 | void playlistToggled( bool ); | 108 | void playlistToggled( bool ); |
106 | void pausedToggled( bool ); | 109 | void pausedToggled( bool ); |
107 | void playingToggled( bool ); | 110 | void playingToggled( bool ); |
108 | void stopToggled( bool ); | 111 | void stopToggled( bool ); |
109 | void positionChanged( long ); // When the slider is moved | 112 | void positionChanged( long ); // When the slider is moved |
110 | void positionUpdated( long ); // When the media file progresses | 113 | void positionUpdated( long ); // When the media file progresses |
111 | void lengthChanged( long ); | 114 | void lengthChanged( long ); |
112 | void viewChanged( char ); | 115 | void viewChanged( char ); |
113 | void blankToggled( bool ); | 116 | void blankToggled( bool ); |
117 | void videoGammaChanged( int ); | ||
114 | void prev(); | 118 | void prev(); |
115 | void next(); | 119 | void next(); |
116 | 120 | ||
117 | private: | 121 | private: |
118 | bool isStreaming; | 122 | bool isStreaming; |
119 | bool isFullscreen; | 123 | bool isFullscreen; |
120 | bool isScaled; | 124 | bool isScaled; |
121 | bool isBlanked; | 125 | bool isBlanked; |
122 | bool isLooping; | 126 | bool isLooping; |
123 | bool isShuffled; | 127 | bool isShuffled; |
124 | bool usePlaylist; | 128 | bool usePlaylist; |
125 | long curPosition; | 129 | long curPosition; |
126 | long curLength; | 130 | long curLength; |
127 | char curView; | 131 | char curView; |
128 | 132 | int videoGamma; | |
129 | void readConfig( Config& cfg ); | 133 | void readConfig( Config& cfg ); |
130 | 134 | ||
131 | }; | 135 | }; |
132 | 136 | ||
133 | 137 | ||
134 | #endif // MEDIA_PLAYER_STATE_H | 138 | #endif // MEDIA_PLAYER_STATE_H |
135 | 139 | ||
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index bd52869..ceda333 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c | |||
@@ -1,58 +1,90 @@ | |||
1 | /* | ||
2 | This file is part of the Opie Project | ||
3 | |||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | ||
5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | ||
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | ||
7 | =. | ||
8 | .=l. | ||
9 | .>+-= | ||
10 | _;:, .> :=|. This program is free software; you can | ||
11 | .> <`_, > . <= redistribute it and/or modify it under | ||
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
13 | .="- .-=="i, .._ License as published by the Free Software | ||
14 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
15 | ._= =} : or (at your option) any later version. | ||
16 | .%`+i> _;_. | ||
17 | .i_,=:_. -<s. This program is distributed in the hope that | ||
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
19 | : .. .:, . . . without even the implied warranty of | ||
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
22 | ..}^=.= = ; General Public License for more | ||
23 | ++= -. .` .: details. | ||
24 | : = ...= . :.=- | ||
25 | -. .:....=;==+<; You should have received a copy of the GNU | ||
26 | -_. . . )=. = General Public License along with | ||
27 | -- :-=` this library; see the file COPYING.LIB. | ||
28 | If not, write to the Free Software Foundation, | ||
29 | Inc., 59 Temple Place - Suite 330, | ||
30 | Boston, MA 02111-1307, USA. | ||
31 | |||
32 | */ | ||
1 | 33 | ||
2 | /*#include <xine.h>*/ | 34 | /*#include <xine.h>*/ |
3 | #include <stdlib.h> | 35 | #include <stdlib.h> |
4 | #include <stdio.h> | 36 | #include <stdio.h> |
5 | 37 | ||
6 | #include <math.h> | 38 | #include <math.h> |
7 | 39 | ||
8 | #include <xine/video_out.h> | 40 | #include <xine/video_out.h> |
9 | #include <xine/xine_internal.h> | 41 | #include <xine/xine_internal.h> |
10 | #include <xine/xineutils.h> | 42 | #include <xine/xineutils.h> |
11 | #include <xine/configfile.h> | 43 | #include <xine/configfile.h> |
12 | 44 | ||
13 | #include <pthread.h> | 45 | #include <pthread.h> |
14 | #include "alphablend.h" | 46 | #include "alphablend.h" |
15 | #include "yuv2rgb.h" | 47 | #include "yuv2rgb.h" |
16 | 48 | ||
17 | #define printf(x,...) | 49 | #define printf(x,...) |
18 | 50 | ||
19 | /* the caller for our event draw handler */ | 51 | /* the caller for our event draw handler */ |
20 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | 52 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, |
21 | int width, int height,int bytes ); | 53 | int width, int height,int bytes ); |
22 | 54 | ||
23 | typedef struct null_driver_s null_driver_t; | 55 | typedef struct null_driver_s null_driver_t; |
24 | 56 | ||
25 | struct null_driver_s { | 57 | struct null_driver_s { |
26 | vo_driver_t vo_driver; | 58 | vo_driver_t vo_driver; |
27 | uint32_t m_capabilities; | 59 | uint32_t m_capabilities; |
28 | int m_show_video; | 60 | int m_show_video; |
29 | int m_video_fullscreen; | 61 | int m_video_fullscreen; |
30 | int m_is_scaling; | 62 | int m_is_scaling; |
31 | int depth, bpp, bytes_per_pixel; | 63 | int depth, bpp, bytes_per_pixel; |
32 | int yuv2rgb_mode; | 64 | int yuv2rgb_mode; |
33 | int yuv2rgb_swap; | 65 | int yuv2rgb_swap; |
34 | int zuv2rgb_gamma; | 66 | int yuv2rgb_gamma; |
35 | uint8_t *yuv2rgb_cmap; | 67 | uint8_t *yuv2rgb_cmap; |
36 | yuv2rgb_factory_t *yuv2rgb_factory; | 68 | yuv2rgb_factory_t *yuv2rgb_factory; |
37 | vo_overlay_t *overlay; | 69 | vo_overlay_t *overlay; |
38 | int user_ratio; | 70 | int user_ratio; |
39 | double output_scale_factor; | 71 | double output_scale_factor; |
40 | int last_frame_output_width; | 72 | int last_frame_output_width; |
41 | int last_frame_output_height; | 73 | int last_frame_output_height; |
42 | int gui_width; | 74 | int gui_width; |
43 | int gui_height; | 75 | int gui_height; |
44 | int gui_changed; | 76 | int gui_changed; |
45 | double display_ratio; | 77 | double display_ratio; |
46 | void* caller; | 78 | void* caller; |
47 | display_xine_frame_t frameDis; | 79 | display_xine_frame_t frameDis; |
48 | 80 | ||
49 | 81 | ||
50 | }; | 82 | }; |
51 | typedef struct opie_frame_s opie_frame_t; | 83 | typedef struct opie_frame_s opie_frame_t; |
52 | struct opie_frame_s { | 84 | struct opie_frame_s { |
53 | vo_frame_t frame; | 85 | vo_frame_t frame; |
54 | char* name; | 86 | char* name; |
55 | int version; | 87 | int version; |
56 | int width; | 88 | int width; |
57 | int height; | 89 | int height; |
58 | int ratio_code; | 90 | int ratio_code; |
@@ -584,58 +616,66 @@ vo_info_t *get_video_out_plugin_info(){ | |||
584 | /** | 616 | /** |
585 | * We know that we will be controled by the XINE LIB++ | 617 | * We know that we will be controled by the XINE LIB++ |
586 | */ | 618 | */ |
587 | 619 | ||
588 | /** | 620 | /** |
589 | * | 621 | * |
590 | */ | 622 | */ |
591 | int null_is_showing_video( vo_driver_t* self ){ | 623 | int null_is_showing_video( vo_driver_t* self ){ |
592 | null_driver_t* this = (null_driver_t*)self; | 624 | null_driver_t* this = (null_driver_t*)self; |
593 | return this->m_show_video; | 625 | return this->m_show_video; |
594 | } | 626 | } |
595 | void null_set_show_video( vo_driver_t* self, int show ) { | 627 | void null_set_show_video( vo_driver_t* self, int show ) { |
596 | ((null_driver_t*)self)->m_show_video = show; | 628 | ((null_driver_t*)self)->m_show_video = show; |
597 | } | 629 | } |
598 | 630 | ||
599 | int null_is_fullscreen( vo_driver_t* self ){ | 631 | int null_is_fullscreen( vo_driver_t* self ){ |
600 | return ((null_driver_t*)self)->m_video_fullscreen; | 632 | return ((null_driver_t*)self)->m_video_fullscreen; |
601 | } | 633 | } |
602 | void null_set_fullscreen( vo_driver_t* self, int screen ){ | 634 | void null_set_fullscreen( vo_driver_t* self, int screen ){ |
603 | ((null_driver_t*)self)->m_video_fullscreen = screen; | 635 | ((null_driver_t*)self)->m_video_fullscreen = screen; |
604 | } | 636 | } |
605 | int null_is_scaling( vo_driver_t* self ){ | 637 | int null_is_scaling( vo_driver_t* self ){ |
606 | return ((null_driver_t*)self)->m_is_scaling; | 638 | return ((null_driver_t*)self)->m_is_scaling; |
607 | } | 639 | } |
640 | |||
641 | void null_set_videoGamma( vo_driver_t* self , int value ) { | ||
642 | ((null_driver_t*) self) ->yuv2rgb_gamma = value; | ||
643 | ((null_driver_t*) self) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self) ->yuv2rgb_factory, value ); | ||
644 | } | ||
645 | |||
608 | void null_set_scaling( vo_driver_t* self, int scale ){ | 646 | void null_set_scaling( vo_driver_t* self, int scale ){ |
609 | ((null_driver_t*)self)->m_is_scaling = scale; | 647 | ((null_driver_t*)self)->m_is_scaling = scale; |
610 | } | 648 | } |
611 | 649 | ||
612 | void null_set_gui_width( vo_driver_t* self, int width ){ | 650 | void null_set_gui_width( vo_driver_t* self, int width ){ |
613 | ((null_driver_t*)self)->gui_width = width; | 651 | ((null_driver_t*)self)->gui_width = width; |
614 | } | 652 | } |
615 | void null_set_gui_height( vo_driver_t* self, int height ){ | 653 | void null_set_gui_height( vo_driver_t* self, int height ){ |
616 | ((null_driver_t*)self)->gui_height = height; | 654 | ((null_driver_t*)self)->gui_height = height; |
617 | } | 655 | } |
656 | |||
657 | |||
618 | void null_set_mode( vo_driver_t* self, int depth, int rgb ){ | 658 | void null_set_mode( vo_driver_t* self, int depth, int rgb ){ |
619 | null_driver_t* this = (null_driver_t*)self; | 659 | null_driver_t* this = (null_driver_t*)self; |
620 | 660 | ||
621 | this->bytes_per_pixel = (depth + 7 ) / 8; | 661 | this->bytes_per_pixel = (depth + 7 ) / 8; |
622 | this->bpp = this->bytes_per_pixel * 8; | 662 | this->bpp = this->bytes_per_pixel * 8; |
623 | this->depth = depth; | 663 | this->depth = depth; |
624 | printf("depth %d %d\n", depth, this->bpp); | 664 | printf("depth %d %d\n", depth, this->bpp); |
625 | printf("pixeltype %d\n", rgb ); | 665 | printf("pixeltype %d\n", rgb ); |
626 | switch ( this->depth ){ | 666 | switch ( this->depth ){ |
627 | case 32: | 667 | case 32: |
628 | if( rgb == 0 ) | 668 | if( rgb == 0 ) |
629 | this->yuv2rgb_mode = MODE_32_RGB; | 669 | this->yuv2rgb_mode = MODE_32_RGB; |
630 | else | 670 | else |
631 | this->yuv2rgb_mode = MODE_32_BGR; | 671 | this->yuv2rgb_mode = MODE_32_BGR; |
632 | case 24: | 672 | case 24: |
633 | if( this->bpp == 32 ) { | 673 | if( this->bpp == 32 ) { |
634 | if(rgb == 0 ) | 674 | if(rgb == 0 ) |
635 | this->yuv2rgb_mode = MODE_32_RGB; | 675 | this->yuv2rgb_mode = MODE_32_RGB; |
636 | else | 676 | else |
637 | this->yuv2rgb_mode = MODE_32_BGR; | 677 | this->yuv2rgb_mode = MODE_32_BGR; |
638 | }else{ | 678 | }else{ |
639 | if( rgb == 0 ) | 679 | if( rgb == 0 ) |
640 | this->yuv2rgb_mode = MODE_24_RGB; | 680 | this->yuv2rgb_mode = MODE_24_RGB; |
641 | else | 681 | else |
@@ -649,24 +689,25 @@ void null_set_mode( vo_driver_t* self, int depth, int rgb ){ | |||
649 | this->yuv2rgb_mode = MODE_16_BGR; | 689 | this->yuv2rgb_mode = MODE_16_BGR; |
650 | break; | 690 | break; |
651 | case 15: | 691 | case 15: |
652 | if( rgb == 0 ) | 692 | if( rgb == 0 ) |
653 | this->yuv2rgb_mode = MODE_15_RGB; | 693 | this->yuv2rgb_mode = MODE_15_RGB; |
654 | else | 694 | else |
655 | this->yuv2rgb_mode = MODE_15_BGR; | 695 | this->yuv2rgb_mode = MODE_15_BGR; |
656 | break; | 696 | break; |
657 | case 8: | 697 | case 8: |
658 | if( rgb == 0 ) | 698 | if( rgb == 0 ) |
659 | this->yuv2rgb_mode = MODE_8_RGB; | 699 | this->yuv2rgb_mode = MODE_8_RGB; |
660 | else | 700 | else |
661 | this->yuv2rgb_mode = MODE_8_BGR; | 701 | this->yuv2rgb_mode = MODE_8_BGR; |
662 | break; | 702 | break; |
663 | }; | 703 | }; |
664 | //free(this->yuv2rgb_factory ); | 704 | //free(this->yuv2rgb_factory ); |
665 | // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap, | 705 | // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap, |
666 | // this->yuv2rgb_cmap); | 706 | // this->yuv2rgb_cmap); |
667 | }; | 707 | }; |
668 | void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data) { | 708 | void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data) { |
669 | null_driver_t* this = (null_driver_t*) self; | 709 | null_driver_t* this = (null_driver_t*) self; |
670 | this->caller = user_data; | 710 | this->caller = user_data; |
671 | this->frameDis = t; | 711 | this->frameDis = t; |
672 | } | 712 | } |
713 | |||
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 6c4d07f..3bd04bc 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -1,50 +1,50 @@ | |||
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 | ..}^=.= = ; Library 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 | -_. . . )=. = Library 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 | #include <qpe/qpetoolbar.h> | 34 | #include <qpe/qpetoolbar.h> |
35 | #include <qpe/qpeapplication.h> | 35 | #include <qpe/qpeapplication.h> |
36 | #include <qpe/storage.h> | 36 | #include <qpe/storage.h> |
37 | #include <qpe/mimetype.h> | 37 | #include <qpe/mimetype.h> |
38 | #include <qpe/global.h> | 38 | #include <qpe/global.h> |
39 | #include <qpe/resource.h> | 39 | #include <qpe/resource.h> |
40 | 40 | ||
41 | #include <qdir.h> | 41 | #include <qdir.h> |
42 | #include <qmessagebox.h> | 42 | #include <qmessagebox.h> |
43 | #include <qregexp.h> | 43 | #include <qregexp.h> |
44 | #include <qtextstream.h> | 44 | #include <qtextstream.h> |
45 | 45 | ||
46 | #include "playlistselection.h" | 46 | #include "playlistselection.h" |
47 | #include "playlistwidget.h" | 47 | #include "playlistwidget.h" |
48 | #include "mediaplayerstate.h" | 48 | #include "mediaplayerstate.h" |
49 | #include "inputDialog.h" | 49 | #include "inputDialog.h" |
50 | 50 | ||
@@ -97,48 +97,49 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
97 | QVBox *stretch2 = new QVBox( vbox1 ); | 97 | QVBox *stretch2 = new QVBox( vbox1 ); |
98 | 98 | ||
99 | connect( tbDeletePlaylist, ( SIGNAL( released() ) ), SLOT( deletePlaylist() ) ); | 99 | connect( tbDeletePlaylist, ( SIGNAL( released() ) ), SLOT( deletePlaylist() ) ); |
100 | connect( pmView, SIGNAL( activated( int ) ), this, SLOT( pmViewActivated( int ) ) ); | 100 | connect( pmView, SIGNAL( activated( int ) ), this, SLOT( pmViewActivated( int ) ) ); |
101 | connect( skinsMenu, SIGNAL( activated( int ) ) , this, SLOT( skinsMenuActivated( int ) ) ); | 101 | connect( skinsMenu, SIGNAL( activated( int ) ) , this, SLOT( skinsMenuActivated( int ) ) ); |
102 | connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), | 102 | connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), |
103 | this,SLOT( playlistViewPressed( int, QListViewItem *, const QPoint&, int ) ) ); | 103 | this,SLOT( playlistViewPressed( int, QListViewItem *, const QPoint&, int ) ) ); |
104 | connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int ) ), | 104 | connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int ) ), |
105 | this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int ) ) ); | 105 | this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int ) ) ); |
106 | connect( audioView, SIGNAL( returnPressed( QListViewItem *) ), | 106 | connect( audioView, SIGNAL( returnPressed( QListViewItem *) ), |
107 | this,SLOT( playIt( QListViewItem *) ) ); | 107 | this,SLOT( playIt( QListViewItem *) ) ); |
108 | connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); | 108 | connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); |
109 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), | 109 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), |
110 | this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) ); | 110 | this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) ); |
111 | connect( videoView, SIGNAL( returnPressed( QListViewItem *) ), | 111 | connect( videoView, SIGNAL( returnPressed( QListViewItem *) ), |
112 | this,SLOT( playIt( QListViewItem *) ) ); | 112 | this,SLOT( playIt( QListViewItem *) ) ); |
113 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); | 113 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); |
114 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); | 114 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); |
115 | connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), this, SLOT( tabChanged( QWidget* ) ) ); | 115 | connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), this, SLOT( tabChanged( QWidget* ) ) ); |
116 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); | 116 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); |
117 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); | 117 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); |
118 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); | 118 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); |
119 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); | 119 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); |
120 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); | 120 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); |
121 | connect ( gammaSlider, SIGNAL( valueChanged( int ) ), mediaPlayerState, SLOT( setVideoGamma( int ) ) ); | ||
121 | 122 | ||
122 | readConfig( cfg ); | 123 | readConfig( cfg ); |
123 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" ); | 124 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" ); |
124 | loadList(DocLnk( currentPlaylist ) ); | 125 | loadList(DocLnk( currentPlaylist ) ); |
125 | setCaption( tr( "OpiePlayer: " ) + currentPlaylist ); | 126 | setCaption( tr( "OpiePlayer: " ) + currentPlaylist ); |
126 | 127 | ||
127 | // see which skins are installed | 128 | // see which skins are installed |
128 | videoScan=FALSE; | 129 | videoScan=FALSE; |
129 | audioScan=FALSE; | 130 | audioScan=FALSE; |
130 | populateSkinsMenu(); | 131 | populateSkinsMenu(); |
131 | initializeStates(); | 132 | initializeStates(); |
132 | } | 133 | } |
133 | 134 | ||
134 | 135 | ||
135 | PlayListWidget::~PlayListWidget() { | 136 | PlayListWidget::~PlayListWidget() { |
136 | // WTF?!@?! | 137 | // WTF?!@?! |
137 | 138 | ||
138 | if ( d->current ) { | 139 | if ( d->current ) { |
139 | delete d->current; | 140 | delete d->current; |
140 | } | 141 | } |
141 | delete d; | 142 | delete d; |
142 | } | 143 | } |
143 | 144 | ||
144 | 145 | ||
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h index 2742252..dcfdd48 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.h +++ b/noncore/multimedia/opieplayer2/playlistwidget.h | |||
@@ -1,50 +1,50 @@ | |||
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 | ..}^=.= = ; Library 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 | -_. . . )=. = Library 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 | #ifndef PLAY_LIST_WIDGET_H | 34 | #ifndef PLAY_LIST_WIDGET_H |
35 | #define PLAY_LIST_WIDGET_H | 35 | #define PLAY_LIST_WIDGET_H |
36 | 36 | ||
37 | #include <qmainwindow.h> | 37 | #include <qmainwindow.h> |
38 | #include <qpe/applnk.h> | 38 | #include <qpe/applnk.h> |
39 | #include <qtabwidget.h> | 39 | #include <qtabwidget.h> |
40 | #include <qpe/fileselector.h> | 40 | #include <qpe/fileselector.h> |
41 | #include <qpushbutton.h> | 41 | #include <qpushbutton.h> |
42 | #include <qpopupmenu.h> | 42 | #include <qpopupmenu.h> |
43 | 43 | ||
44 | #include "playlistwidgetgui.h" | 44 | #include "playlistwidgetgui.h" |
45 | 45 | ||
46 | 46 | ||
47 | //class PlayListWidgetPrivate; | 47 | //class PlayListWidgetPrivate; |
48 | class Config; | 48 | class Config; |
49 | class QListViewItem; | 49 | class QListViewItem; |
50 | class QListView; | 50 | class QListView; |
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp index 6ecd016..250833c 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | |||
@@ -1,50 +1,50 @@ | |||
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 | ..}^=.= = ; Library 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 | -_. . . )=. = Library 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 | #include <qpe/qpemenubar.h> | 34 | #include <qpe/qpemenubar.h> |
35 | #include <qpe/qpetoolbar.h> | 35 | #include <qpe/qpetoolbar.h> |
36 | #include <qpe/fileselector.h> | 36 | #include <qpe/fileselector.h> |
37 | #include <qpe/qpeapplication.h> | 37 | #include <qpe/qpeapplication.h> |
38 | #include <qpe/storage.h> | 38 | #include <qpe/storage.h> |
39 | #include <qpe/mimetype.h> | 39 | #include <qpe/mimetype.h> |
40 | #include <qpe/config.h> | 40 | #include <qpe/config.h> |
41 | #include <qpe/global.h> | 41 | #include <qpe/global.h> |
42 | #include <qpe/resource.h> | 42 | #include <qpe/resource.h> |
43 | 43 | ||
44 | #include <qpopupmenu.h> | 44 | #include <qpopupmenu.h> |
45 | #include <qaction.h> | 45 | #include <qaction.h> |
46 | #include <qcursor.h> | 46 | #include <qcursor.h> |
47 | #include <qdir.h> | 47 | #include <qdir.h> |
48 | #include <qlayout.h> | 48 | #include <qlayout.h> |
49 | 49 | ||
50 | #include "playlistselection.h" | 50 | #include "playlistselection.h" |
@@ -78,48 +78,67 @@ PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags | |||
78 | // Create Menubar | 78 | // Create Menubar |
79 | QPEMenuBar *menu = new QPEMenuBar( toolbar ); | 79 | QPEMenuBar *menu = new QPEMenuBar( toolbar ); |
80 | menu->setMargin( 0 ); | 80 | menu->setMargin( 0 ); |
81 | 81 | ||
82 | bar = new QPEToolBar( this ); | 82 | bar = new QPEToolBar( this ); |
83 | bar->setLabel( tr( "Play Operations" ) ); | 83 | bar->setLabel( tr( "Play Operations" ) ); |
84 | 84 | ||
85 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" ); | 85 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" ); |
86 | tbDeletePlaylist->setFlat( TRUE ); | 86 | tbDeletePlaylist->setFlat( TRUE ); |
87 | tbDeletePlaylist->setFixedSize( 20, 20 ); | 87 | tbDeletePlaylist->setFixedSize( 20, 20 ); |
88 | 88 | ||
89 | tbDeletePlaylist->hide(); | 89 | tbDeletePlaylist->hide(); |
90 | 90 | ||
91 | pmPlayList = new QPopupMenu( this ); | 91 | pmPlayList = new QPopupMenu( this ); |
92 | menu->insertItem( tr( "File" ), pmPlayList ); | 92 | menu->insertItem( tr( "File" ), pmPlayList ); |
93 | 93 | ||
94 | pmView = new QPopupMenu( this ); | 94 | pmView = new QPopupMenu( this ); |
95 | menu->insertItem( tr( "View" ), pmView ); | 95 | menu->insertItem( tr( "View" ), pmView ); |
96 | pmView->isCheckable(); | 96 | pmView->isCheckable(); |
97 | 97 | ||
98 | skinsMenu = new QPopupMenu( this ); | 98 | skinsMenu = new QPopupMenu( this ); |
99 | pmView->insertItem( tr( "Skins" ), skinsMenu ); | 99 | pmView->insertItem( tr( "Skins" ), skinsMenu ); |
100 | skinsMenu->isCheckable(); | 100 | skinsMenu->isCheckable(); |
101 | 101 | ||
102 | gammaMenu = new QPopupMenu( this ); | ||
103 | pmView->insertItem( tr( "Gamma" ), gammaMenu ); | ||
104 | gammaMenu->setMinimumHeight( 50 ); | ||
105 | |||
106 | gammaSlider = new QSlider( QSlider::Vertical, gammaMenu ); | ||
107 | gammaSlider->setRange( -100, 100 ); | ||
108 | gammaSlider->setTickmarks( QSlider::Left ); | ||
109 | gammaSlider->setTickInterval( 20 ); | ||
110 | gammaSlider->setFocusPolicy( QWidget::NoFocus ); | ||
111 | gammaSlider->setValue( 0 ); | ||
112 | gammaSlider->setMinimumHeight( 50 ); | ||
113 | |||
114 | gammaLCD = new QLCDNumber( 3, gammaMenu ); | ||
115 | |||
116 | gammaMenu->insertItem( gammaSlider ); | ||
117 | gammaMenu->insertItem( gammaLCD ); | ||
118 | |||
119 | connect( gammaSlider, SIGNAL( valueChanged( int ) ), gammaLCD, SLOT( display( int ) ) ); | ||
120 | |||
102 | vbox5 = new QVBox( this ); | 121 | vbox5 = new QVBox( this ); |
103 | QVBox *vbox4 = new QVBox( vbox5 ); | 122 | QVBox *vbox4 = new QVBox( vbox5 ); |
104 | QHBox *hbox6 = new QHBox( vbox4 ); | 123 | QHBox *hbox6 = new QHBox( vbox4 ); |
105 | 124 | ||
106 | tabWidget = new QTabWidget( hbox6, "tabWidget" ); | 125 | tabWidget = new QTabWidget( hbox6, "tabWidget" ); |
107 | 126 | ||
108 | QWidget *pTab; | 127 | QWidget *pTab; |
109 | pTab = new QWidget( tabWidget, "pTab" ); | 128 | pTab = new QWidget( tabWidget, "pTab" ); |
110 | tabWidget->insertTab( pTab,"Playlist"); | 129 | tabWidget->insertTab( pTab,"Playlist"); |
111 | 130 | ||
112 | QGridLayout *Playout = new QGridLayout( pTab ); | 131 | QGridLayout *Playout = new QGridLayout( pTab ); |
113 | Playout->setSpacing( 2); | 132 | Playout->setSpacing( 2); |
114 | Playout->setMargin( 2); | 133 | Playout->setMargin( 2); |
115 | 134 | ||
116 | // Add the playlist area | 135 | // Add the playlist area |
117 | QVBox *vbox3 = new QVBox( pTab ); | 136 | QVBox *vbox3 = new QVBox( pTab ); |
118 | d->playListFrame = vbox3; | 137 | d->playListFrame = vbox3; |
119 | 138 | ||
120 | QHBox *hbox2 = new QHBox( vbox3 ); | 139 | QHBox *hbox2 = new QHBox( vbox3 ); |
121 | d->selectedFiles = new PlayListSelection( hbox2 ); | 140 | d->selectedFiles = new PlayListSelection( hbox2 ); |
122 | 141 | ||
123 | vbox1 = new QVBox( hbox2 ); | 142 | vbox1 = new QVBox( hbox2 ); |
124 | QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold ); | 143 | QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold ); |
125 | QVBox *stretch1 = new QVBox( vbox1 ); // add stretch | 144 | QVBox *stretch1 = new QVBox( vbox1 ); // add stretch |
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h index 4c8d737..61fd40d 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h | |||
@@ -1,71 +1,72 @@ | |||
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 | ..}^=.= = ; Library 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 | -_. . . )=. = Library 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 | #ifndef PLAY_LIST_WIDGET_GUI_H | 34 | #ifndef PLAY_LIST_WIDGET_GUI_H |
35 | #define PLAY_LIST_WIDGET_GUI_H | 35 | #define PLAY_LIST_WIDGET_GUI_H |
36 | 36 | ||
37 | #include <qmainwindow.h> | 37 | #include <qmainwindow.h> |
38 | #include <qpe/applnk.h> | 38 | #include <qpe/applnk.h> |
39 | #include <qpe/resource.h> | 39 | #include <qpe/resource.h> |
40 | #include <qpe/qpemenubar.h> | 40 | #include <qpe/qpemenubar.h> |
41 | 41 | ||
42 | #include <qtabwidget.h> | 42 | #include <qtabwidget.h> |
43 | #include <qpe/fileselector.h> | 43 | #include <qpe/fileselector.h> |
44 | #include <qpushbutton.h> | 44 | #include <qpushbutton.h> |
45 | #include <qpopupmenu.h> | 45 | #include <qpopupmenu.h> |
46 | #include <qaction.h> | 46 | #include <qaction.h> |
47 | 47 | #include <qslider.h> | |
48 | #include <qlcdnumber.h> | ||
48 | 49 | ||
49 | class PlayListWidgetPrivate; | 50 | class PlayListWidgetPrivate; |
50 | class PlayListSelection; | 51 | class PlayListSelection; |
51 | 52 | ||
52 | class Config; | 53 | class Config; |
53 | class QPEToolBar; | 54 | class QPEToolBar; |
54 | class QListViewItem; | 55 | class QListViewItem; |
55 | class QListView; | 56 | class QListView; |
56 | class QPoint; | 57 | class QPoint; |
57 | class QAction; | 58 | class QAction; |
58 | class QLabel; | 59 | class QLabel; |
59 | 60 | ||
60 | class PlayListWidgetPrivate { | 61 | class PlayListWidgetPrivate { |
61 | public: | 62 | public: |
62 | QToolButton *tbPlay, *tbFull, *tbLoop, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; | 63 | QToolButton *tbPlay, *tbFull, *tbLoop, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; |
63 | QFrame *playListFrame; | 64 | QFrame *playListFrame; |
64 | FileSelector *files; | 65 | FileSelector *files; |
65 | PlayListSelection *selectedFiles; | 66 | PlayListSelection *selectedFiles; |
66 | bool setDocumentUsed; | 67 | bool setDocumentUsed; |
67 | DocLnk *current; | 68 | DocLnk *current; |
68 | }; | 69 | }; |
69 | 70 | ||
70 | 71 | ||
71 | class ToolButton : public QToolButton { | 72 | class ToolButton : public QToolButton { |
@@ -83,44 +84,47 @@ public: | |||
83 | }; | 84 | }; |
84 | 85 | ||
85 | 86 | ||
86 | class MenuItem : public QAction { | 87 | class MenuItem : public QAction { |
87 | 88 | ||
88 | public: | 89 | public: |
89 | MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot ) | 90 | MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot ) |
90 | : QAction( text, QString::null, 0, 0 ) { | 91 | : QAction( text, QString::null, 0, 0 ) { |
91 | connect( this, SIGNAL( activated() ), handler, slot ); | 92 | connect( this, SIGNAL( activated() ), handler, slot ); |
92 | addTo( parent ); | 93 | addTo( parent ); |
93 | } | 94 | } |
94 | }; | 95 | }; |
95 | 96 | ||
96 | class PlayListWidgetGui : public QMainWindow { | 97 | class PlayListWidgetGui : public QMainWindow { |
97 | Q_OBJECT | 98 | Q_OBJECT |
98 | public: | 99 | public: |
99 | PlayListWidgetGui( QWidget* parent=0, const char* name=0, WFlags fl=0 ); | 100 | PlayListWidgetGui( QWidget* parent=0, const char* name=0, WFlags fl=0 ); |
100 | ~PlayListWidgetGui(); | 101 | ~PlayListWidgetGui(); |
101 | 102 | ||
102 | protected: | 103 | protected: |
103 | QTabWidget * tabWidget; | 104 | QTabWidget * tabWidget; |
104 | QListView *audioView, *videoView, *playlistView; | 105 | QListView *audioView, *videoView, *playlistView; |
105 | QLabel *libString; | 106 | QLabel *libString; |
106 | QPopupMenu *pmView ; | 107 | QPopupMenu *pmView ; |
108 | QPopupMenu *gammaMenu; | ||
109 | QSlider *gammaSlider; | ||
110 | QLCDNumber *gammaLCD; | ||
107 | bool fromSetDocument; | 111 | bool fromSetDocument; |
108 | bool insanityBool; | 112 | bool insanityBool; |
109 | QString setDocFileRef; | 113 | QString setDocFileRef; |
110 | // retrieve the current playlist entry (media file link) | 114 | // retrieve the current playlist entry (media file link) |
111 | QPushButton *tbDeletePlaylist; | 115 | QPushButton *tbDeletePlaylist; |
112 | int selected; | 116 | int selected; |
113 | QPopupMenu *pmPlayList; | 117 | QPopupMenu *pmPlayList; |
114 | FileSelector* playLists; | 118 | FileSelector* playLists; |
115 | QPopupMenu *skinsMenu; | 119 | QPopupMenu *skinsMenu; |
116 | PlayListWidgetPrivate *d; // Private implementation data | 120 | PlayListWidgetPrivate *d; // Private implementation data |
117 | QVBox *vbox1; | 121 | QVBox *vbox1; |
118 | QVBox *vbox5; | 122 | QVBox *vbox5; |
119 | QPEToolBar *bar; | 123 | QPEToolBar *bar; |
120 | void setActiveWindow(); // need to handle this to show the right view | 124 | void setActiveWindow(); // need to handle this to show the right view |
121 | void setView( char ); | 125 | void setView( char ); |
122 | 126 | ||
123 | }; | 127 | }; |
124 | 128 | ||
125 | #endif | 129 | #endif |
126 | 130 | ||
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index 12d80ba..d18fde5 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp | |||
@@ -1,140 +1,145 @@ | |||
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 | ..}^=.= = ; Library 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 | -_. . . )=. = Library 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 <qpe/qcopenvelope_qws.h> | 36 | #include <qpe/qcopenvelope_qws.h> |
37 | #include <qpe/qpeapplication.h> | 37 | #include <qpe/qpeapplication.h> |
38 | #include "xinecontrol.h" | 38 | #include "xinecontrol.h" |
39 | #include "mediaplayerstate.h" | 39 | #include "mediaplayerstate.h" |
40 | #include "videowidget.h" | 40 | #include "videowidget.h" |
41 | 41 | ||
42 | extern MediaPlayerState *mediaPlayerState; | 42 | extern MediaPlayerState *mediaPlayerState; |
43 | extern VideoWidget *videoUI; | 43 | extern VideoWidget *videoUI; |
44 | XineControl::XineControl( QObject *parent, const char *name ) | 44 | XineControl::XineControl( QObject *parent, const char *name ) |
45 | : QObject( parent, name ) { | 45 | : QObject( parent, name ) { |
46 | libXine = new XINE::Lib(videoUI->vidWidget() ); | 46 | libXine = new XINE::Lib(videoUI->vidWidget() ); |
47 | 47 | ||
48 | connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & ))); | 48 | connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & ))); |
49 | connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); | 49 | connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); |
50 | connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) ); | 50 | connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) ); |
51 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); | 51 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); |
52 | connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); | 52 | connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); |
53 | connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); | 53 | connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); |
54 | connect( mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); | ||
54 | connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); | 55 | connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); |
55 | 56 | ||
56 | disabledSuspendScreenSaver = FALSE; | 57 | disabledSuspendScreenSaver = FALSE; |
57 | } | 58 | } |
58 | 59 | ||
59 | XineControl::~XineControl() { | 60 | XineControl::~XineControl() { |
60 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 61 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
61 | if ( disabledSuspendScreenSaver ) { | 62 | if ( disabledSuspendScreenSaver ) { |
62 | disabledSuspendScreenSaver = FALSE; | 63 | disabledSuspendScreenSaver = FALSE; |
63 | // Re-enable the suspend mode | 64 | // Re-enable the suspend mode |
64 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; | 65 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; |
65 | } | 66 | } |
66 | #endif | 67 | #endif |
67 | delete libXine; | 68 | delete libXine; |
68 | } | 69 | } |
69 | 70 | ||
70 | void XineControl::play( const QString& fileName ) { | 71 | void XineControl::play( const QString& fileName ) { |
71 | hasVideoChannel=FALSE; | 72 | hasVideoChannel=FALSE; |
72 | hasAudioChannel=FALSE; | 73 | hasAudioChannel=FALSE; |
73 | m_fileName = fileName; | 74 | m_fileName = fileName; |
74 | 75 | ||
75 | qDebug("<<FILENAME: " + fileName + ">>>>"); | 76 | //qDebug("<<FILENAME: " + fileName + ">>>>"); |
76 | 77 | ||
77 | libXine->play( fileName ); | 78 | libXine->play( fileName ); |
78 | mediaPlayerState->setPlaying( true ); | 79 | mediaPlayerState->setPlaying( true ); |
79 | // default to audio view until we know how to handle video | 80 | // default to audio view until we know how to handle video |
80 | // MediaDetect mdetect; | 81 | // MediaDetect mdetect; |
81 | char whichGui = mdetect.videoOrAudio( fileName ); | 82 | char whichGui = mdetect.videoOrAudio( fileName ); |
82 | if (whichGui == 'f') { | 83 | if (whichGui == 'f') { |
83 | qDebug("Nicht erkannter Dateityp"); | 84 | qDebug("Nicht erkannter Dateityp"); |
84 | return; | 85 | return; |
85 | } | 86 | } |
86 | 87 | ||
87 | if (whichGui == 'a') { | 88 | if (whichGui == 'a') { |
88 | libXine->setShowVideo( false ); | 89 | libXine->setShowVideo( false ); |
89 | hasAudioChannel=TRUE; | 90 | hasAudioChannel=TRUE; |
90 | } else { | 91 | } else { |
91 | libXine->setShowVideo( true ); | 92 | libXine->setShowVideo( true ); |
92 | hasVideoChannel=TRUE; | 93 | hasVideoChannel=TRUE; |
93 | } | 94 | } |
94 | 95 | ||
95 | // determine if slider is shown | 96 | // determine if slider is shown |
96 | mediaPlayerState->setIsStreaming( !libXine->isSeekable() ); | 97 | mediaPlayerState->setIsStreaming( !libXine->isSeekable() ); |
97 | // which gui (video / audio) | 98 | // which gui (video / audio) |
98 | mediaPlayerState->setView( whichGui ); | 99 | mediaPlayerState->setView( whichGui ); |
99 | 100 | ||
100 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 101 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
101 | if ( !disabledSuspendScreenSaver ) { | 102 | if ( !disabledSuspendScreenSaver ) { |
102 | disabledSuspendScreenSaver = TRUE; | 103 | disabledSuspendScreenSaver = TRUE; |
103 | // Stop the screen from blanking and power saving state | 104 | // Stop the screen from blanking and power saving state |
104 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) | 105 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) |
105 | << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend ); | 106 | << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend ); |
106 | } | 107 | } |
107 | #endif | 108 | #endif |
108 | 109 | ||
109 | length(); | 110 | length(); |
110 | position(); | 111 | position(); |
111 | } | 112 | } |
112 | 113 | ||
113 | void XineControl::nextMedia() { | 114 | void XineControl::nextMedia() { |
114 | mediaPlayerState->setNext(); | 115 | mediaPlayerState->setNext(); |
115 | } | 116 | } |
116 | 117 | ||
118 | void XineControl::setGamma( int value ) { | ||
119 | libXine->setGamma( value ); | ||
120 | } | ||
121 | |||
117 | void XineControl::stop( bool isSet ) { | 122 | void XineControl::stop( bool isSet ) { |
118 | if ( !isSet) { | 123 | if ( !isSet) { |
119 | libXine->stop( ); | 124 | libXine->stop( ); |
120 | mediaPlayerState->setList(); | 125 | mediaPlayerState->setList(); |
121 | // mediaPlayerState->setPlaying( false ); | 126 | // mediaPlayerState->setPlaying( false ); |
122 | 127 | ||
123 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 128 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
124 | if ( disabledSuspendScreenSaver ) { | 129 | if ( disabledSuspendScreenSaver ) { |
125 | disabledSuspendScreenSaver = FALSE; | 130 | disabledSuspendScreenSaver = FALSE; |
126 | // Re-enable the suspend mode | 131 | // Re-enable the suspend mode |
127 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; | 132 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; |
128 | } | 133 | } |
129 | #endif | 134 | #endif |
130 | 135 | ||
131 | } else { | 136 | } else { |
132 | // play again | 137 | // play again |
133 | } | 138 | } |
134 | } | 139 | } |
135 | 140 | ||
136 | /** | 141 | /** |
137 | * Pause playback | 142 | * Pause playback |
138 | * @isSet | 143 | * @isSet |
139 | */ | 144 | */ |
140 | void XineControl::pause( bool isSet) { | 145 | void XineControl::pause( bool isSet) { |
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h index 4263b36..1de610b 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.h +++ b/noncore/multimedia/opieplayer2/xinecontrol.h | |||
@@ -1,79 +1,106 @@ | |||
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 | ..}^=.= = ; Library 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 | -_. . . )=. = Library 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 | #ifndef XINECONTROL_H | 34 | #ifndef XINECONTROL_H |
35 | #define XINECONTROL_H | 35 | #define XINECONTROL_H |
36 | 36 | ||
37 | #include "lib.h" | 37 | #include "lib.h" |
38 | #include "mediadetect.h" | 38 | #include "mediadetect.h" |
39 | #include <qobject.h> | 39 | #include <qobject.h> |
40 | 40 | ||
41 | class XineControl : public QObject { | 41 | class XineControl : public QObject { |
42 | Q_OBJECT | 42 | Q_OBJECT |
43 | public: | 43 | public: |
44 | XineControl( QObject *parent = 0, const char *name =0 ); | 44 | XineControl( QObject *parent = 0, const char *name =0 ); |
45 | ~XineControl(); | 45 | ~XineControl(); |
46 | 46 | ||
47 | bool hasVideo() const { return hasVideoChannel; } | 47 | bool hasVideo() const { return hasVideoChannel; } |
48 | bool hasAudio() const { return hasAudioChannel; } | 48 | bool hasAudio() const { return hasAudioChannel; } |
49 | 49 | ||
50 | public slots: | 50 | public slots: |
51 | void play( const QString& fileName ); | 51 | void play( const QString& fileName ); |
52 | void stop( bool ); | 52 | void stop( bool ); |
53 | |||
54 | /** | ||
55 | * Pause the media stream | ||
56 | * @param if pause or not | ||
57 | */ | ||
53 | void pause( bool ); | 58 | void pause( bool ); |
59 | |||
60 | /** | ||
61 | * Set videos fullscreen | ||
62 | * @param yes or no | ||
63 | */ | ||
54 | void setFullscreen( bool ); | 64 | void setFullscreen( bool ); |
65 | |||
66 | /** | ||
67 | * | ||
68 | */ | ||
55 | long currentTime(); | 69 | long currentTime(); |
56 | void seekTo( long ); | 70 | void seekTo( long ); |
57 | // get length of media file and set it | 71 | // get length of media file and set it |
58 | void length(); | 72 | void length(); |
59 | long position(); | 73 | long position(); |
74 | |||
75 | /** | ||
76 | * Proceed to the next media file in playlist | ||
77 | */ | ||
60 | void nextMedia(); | 78 | void nextMedia(); |
79 | |||
61 | void videoResized ( const QSize &s ); | 80 | void videoResized ( const QSize &s ); |
62 | 81 | ||
82 | /** | ||
83 | * Set the gamma value of the video output | ||
84 | * @param int value between -100 and 100, 0 is original | ||
85 | */ | ||
86 | void setGamma( int ); | ||
87 | |||
88 | |||
63 | private: | 89 | private: |
64 | XINE::Lib *libXine; | 90 | XINE::Lib *libXine; |
65 | MediaDetect mdetect; | 91 | MediaDetect mdetect; |
66 | long m_currentTime; | 92 | long m_currentTime; |
67 | long m_position; | 93 | long m_position; |
68 | int m_length; | 94 | int m_length; |
69 | QString m_fileName; | 95 | QString m_fileName; |
70 | bool disabledSuspendScreenSaver : 1; | 96 | bool disabledSuspendScreenSaver : 1; |
71 | bool hasVideoChannel : 1; | 97 | bool hasVideoChannel : 1; |
72 | bool hasAudioChannel : 1; | 98 | bool hasAudioChannel : 1; |
99 | |||
73 | signals: | 100 | signals: |
74 | void positionChanged( long ); | 101 | void positionChanged( long ); |
75 | 102 | ||
76 | }; | 103 | }; |
77 | 104 | ||
78 | 105 | ||
79 | #endif | 106 | #endif |
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index bc95d86..d06d62a 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp | |||
diff --git a/noncore/multimedia/opieplayer2/yuv2rgb.c b/noncore/multimedia/opieplayer2/yuv2rgb.c index 22bb4cb..e8e86e6 100644 --- a/noncore/multimedia/opieplayer2/yuv2rgb.c +++ b/noncore/multimedia/opieplayer2/yuv2rgb.c | |||
@@ -3042,49 +3042,48 @@ yuv2rgb_t *yuv2rgb_create_converter (yuv2rgb_factory_t *factory) { | |||
3042 | yuv2rgb_t *this = xine_xmalloc (sizeof (yuv2rgb_t)); | 3042 | yuv2rgb_t *this = xine_xmalloc (sizeof (yuv2rgb_t)); |
3043 | 3043 | ||
3044 | this->cmap = factory->cmap; | 3044 | this->cmap = factory->cmap; |
3045 | 3045 | ||
3046 | this->y_chunk = this->y_buffer = NULL; | 3046 | this->y_chunk = this->y_buffer = NULL; |
3047 | this->u_chunk = this->u_buffer = NULL; | 3047 | this->u_chunk = this->u_buffer = NULL; |
3048 | this->v_chunk = this->v_buffer = NULL; | 3048 | this->v_chunk = this->v_buffer = NULL; |
3049 | 3049 | ||
3050 | this->table_rV = factory->table_rV; | 3050 | this->table_rV = factory->table_rV; |
3051 | this->table_gU = factory->table_gU; | 3051 | this->table_gU = factory->table_gU; |
3052 | this->table_gV = factory->table_gV; | 3052 | this->table_gV = factory->table_gV; |
3053 | this->table_bU = factory->table_bU; | 3053 | this->table_bU = factory->table_bU; |
3054 | 3054 | ||
3055 | this->yuv2rgb_fun = factory->yuv2rgb_fun; | 3055 | this->yuv2rgb_fun = factory->yuv2rgb_fun; |
3056 | this->yuy22rgb_fun = factory->yuy22rgb_fun; | 3056 | this->yuy22rgb_fun = factory->yuy22rgb_fun; |
3057 | this->yuv2rgb_single_pixel_fun = factory->yuv2rgb_single_pixel_fun; | 3057 | this->yuv2rgb_single_pixel_fun = factory->yuv2rgb_single_pixel_fun; |
3058 | 3058 | ||
3059 | this->configure = yuv2rgb_configure; | 3059 | this->configure = yuv2rgb_configure; |
3060 | return this; | 3060 | return this; |
3061 | } | 3061 | } |
3062 | 3062 | ||
3063 | /* | 3063 | /* |
3064 | * factory functions | 3064 | * factory functions |
3065 | */ | 3065 | */ |
3066 | |||
3067 | void yuv2rgb_set_gamma (yuv2rgb_factory_t *this, int gamma) { | 3066 | void yuv2rgb_set_gamma (yuv2rgb_factory_t *this, int gamma) { |
3068 | 3067 | ||
3069 | int i; | 3068 | int i; |
3070 | 3069 | ||
3071 | for (i = 0; i < 256; i++) { | 3070 | for (i = 0; i < 256; i++) { |
3072 | (uint8_t *)this->table_rV[i] += this->entry_size*(gamma - this->gamma); | 3071 | (uint8_t *)this->table_rV[i] += this->entry_size*(gamma - this->gamma); |
3073 | (uint8_t *)this->table_gU[i] += this->entry_size*(gamma - this->gamma); | 3072 | (uint8_t *)this->table_gU[i] += this->entry_size*(gamma - this->gamma); |
3074 | (uint8_t *)this->table_bU[i] += this->entry_size*(gamma - this->gamma); | 3073 | (uint8_t *)this->table_bU[i] += this->entry_size*(gamma - this->gamma); |
3075 | } | 3074 | } |
3076 | #ifdef ARCH_X86 | 3075 | #ifdef ARCH_X86 |
3077 | mmx_yuv2rgb_set_gamma(gamma); | 3076 | mmx_yuv2rgb_set_gamma(gamma); |
3078 | #endif | 3077 | #endif |
3079 | this->gamma = gamma; | 3078 | this->gamma = gamma; |
3080 | } | 3079 | } |
3081 | 3080 | ||
3082 | int yuv2rgb_get_gamma (yuv2rgb_factory_t *this) { | 3081 | int yuv2rgb_get_gamma (yuv2rgb_factory_t *this) { |
3083 | 3082 | ||
3084 | return this->gamma; | 3083 | return this->gamma; |
3085 | } | 3084 | } |
3086 | 3085 | ||
3087 | yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped, | 3086 | yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped, |
3088 | uint8_t *cmap) { | 3087 | uint8_t *cmap) { |
3089 | 3088 | ||
3090 | yuv2rgb_factory_t *this; | 3089 | yuv2rgb_factory_t *this; |