author | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
commit | e16d333ec2e8509fc665921ca106c25325bae9e0 (patch) (unidiff) | |
tree | 9e9068190a15bc9b2a52ab33b40881128f732c0e /noncore/multimedia | |
parent | 1c58d1407f9584fedcdae390a04e2b37e5853361 (diff) | |
download | opie-e16d333ec2e8509fc665921ca106c25325bae9e0.zip opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.gz opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.bz2 |
Merge from BRANCH_1_0
30 files changed, 999 insertions, 237 deletions
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control index 2de15e9..faa041b 100644 --- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control +++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control | |||
@@ -2,7 +2,7 @@ Package: opie-mediaplayer2-skin-Pod | |||
2 | Files: pics/mediaplayer/skins/Pod | 2 | Files: pics/mediaplayer/skins/Pod |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: ljp <llornkcor@handhelds.org> | 5 | Maintainer: ljp <llornkcor@handhelds.org> |
6 | Version: $QPE_VERSION-$SUB_VERSION | ||
7 | Description: Opie Mediaplayer's skin. | 6 | Description: Opie Mediaplayer's skin. |
8 | 7 | ||
8 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control index 570b25a..4bc3c60 100644 --- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control +++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control | |||
@@ -3,7 +3,7 @@ Files: pics/opieplayer2/skins/default_landscape | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/playerskins | 4 | Section: opie/playerskins |
5 | Maintainer: L.J.Potter <ljp@llornkcor.com> | 5 | Maintainer: L.J.Potter <ljp@llornkcor.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Landscape skin for opie mediaplayer's | 8 | Description: Landscape skin for opie mediaplayer's |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control index 5cd7509..d076fab 100644 --- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control +++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control | |||
@@ -3,7 +3,7 @@ Files: pics/opieplayer2/skins/default | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/playerskins | 4 | Section: opie/playerskins |
5 | Maintainer: L.J.Potter <ljp@llornkcor.com> | 5 | Maintainer: L.J.Potter <ljp@llornkcor.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Default skin for opie mediaplayer's | 8 | Description: Default skin for opie mediaplayer's |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control index 0ff1427..ad8c1f8 100644 --- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control +++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control | |||
@@ -2,7 +2,7 @@ Package: opie-mediaplayer2-skin-techno | |||
2 | Files: pics/mediaplayer/skins/techno | 2 | Files: pics/mediaplayer/skins/techno |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: ljp <llornkcor@handhelds.org> | 5 | Maintainer: ljp <llornkcor@handhelds.org> |
6 | Version: $QPE_VERSION-$SUB_VERSION | ||
7 | Description: Techno Opie Mediaplayer's skin. Adapted from Qtopia | 6 | Description: Techno Opie Mediaplayer's skin. Adapted from Qtopia |
8 | 7 | ||
8 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 5d929cb..2c54ae6 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -30,22 +30,8 @@ | |||
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <qpe/qpeapplication.h> | ||
35 | #include <qpe/resource.h> | ||
36 | #include <qpe/config.h> | ||
37 | #include <opie/oticker.h> | ||
38 | |||
39 | #include <qwidget.h> | ||
40 | #include <qpixmap.h> | ||
41 | #include <qbutton.h> | ||
42 | #include <qpainter.h> | ||
43 | #include <qframe.h> | ||
44 | #include <qlayout.h> | ||
45 | #include <qdir.h> | ||
46 | #include <stdlib.h> | ||
47 | #include <stdio.h> | ||
48 | 34 | ||
49 | #include "audiowidget.h" | 35 | #include "audiowidget.h" |
50 | #include "mediaplayerstate.h" | 36 | #include "mediaplayerstate.h" |
51 | #include "playlistwidget.h" | 37 | #include "playlistwidget.h" |
@@ -189,9 +175,9 @@ void AudioWidget::loadSkin() | |||
189 | // QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); | 175 | // QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); |
190 | 176 | ||
191 | time.setFocusPolicy( QWidget::NoFocus ); | 177 | time.setFocusPolicy( QWidget::NoFocus ); |
192 | time.setAlignment( Qt::AlignCenter ); | 178 | time.setAlignment( Qt::AlignCenter ); |
193 | 179 | ||
194 | // time.setFrame(FALSE); | 180 | // time.setFrame(FALSE); |
195 | // changeTextColor( &time ); | 181 | // changeTextColor( &time ); |
196 | 182 | ||
197 | resizeEvent( 0 ); | 183 | resizeEvent( 0 ); |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 53dbb88..b436239 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -33,16 +33,9 @@ | |||
33 | 33 | ||
34 | #ifndef AUDIO_WIDGET_H | 34 | #ifndef AUDIO_WIDGET_H |
35 | #define AUDIO_WIDGET_H | 35 | #define AUDIO_WIDGET_H |
36 | 36 | ||
37 | #include <qpainter.h> | ||
38 | #include <qdrawutil.h> | ||
39 | #include <qpixmap.h> | ||
40 | #include <qstring.h> | ||
41 | #include <qslider.h> | ||
42 | #include <qframe.h> | ||
43 | #include <qlineedit.h> | 37 | #include <qlineedit.h> |
44 | #include <qimage.h> | ||
45 | 38 | ||
46 | #include <opie/oticker.h> | 39 | #include <opie/oticker.h> |
47 | 40 | ||
48 | #include "mediawidget.h" | 41 | #include "mediawidget.h" |
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index d04af08..11ad745 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -30,15 +30,11 @@ | |||
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <stdio.h> | 34 | |
35 | #include <stdlib.h> | ||
36 | #include <qimage.h> | ||
37 | #include <qtextstream.h> | 35 | #include <qtextstream.h> |
38 | #include <qpe/resource.h> | ||
39 | 36 | ||
40 | #include <qfile.h> | ||
41 | #include <qdir.h> | 37 | #include <qdir.h> |
42 | 38 | ||
43 | #include <qgfx_qws.h> | 39 | #include <qgfx_qws.h> |
44 | #include <qdirectpainter_qws.h> | 40 | #include <qdirectpainter_qws.h> |
@@ -71,9 +67,9 @@ extern "C" { | |||
71 | } | 67 | } |
72 | 68 | ||
73 | using namespace XINE; | 69 | using namespace XINE; |
74 | 70 | ||
75 | Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) | 71 | Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) |
76 | { | 72 | { |
77 | m_initialized = false; | 73 | m_initialized = false; |
78 | m_duringInitialization = false; | 74 | m_duringInitialization = false; |
79 | m_video = false; | 75 | m_video = false; |
@@ -87,8 +83,18 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) | |||
87 | QFile f(configPath); | 83 | QFile f(configPath); |
88 | f.open(IO_WriteOnly); | 84 | f.open(IO_WriteOnly); |
89 | QTextStream ts( &f ); | 85 | QTextStream ts( &f ); |
90 | ts << "misc.memcpy_method:glibc\n"; | 86 | ts << "misc.memcpy_method:glibc\n"; |
87 | ts << "# uncomment if you experience double speed audio \n #audio.oss_sync_method:softsync\n"; | ||
88 | ts << "codec.ffmpeg_pp_quality:3\n"; | ||
89 | ts << "audio.num_buffers:50\n"; | ||
90 | ts << "audio.size_buffers:4160\n"; | ||
91 | ts << "video.num_buffers:20\n"; | ||
92 | ts << "video.size_buffers:4096\n"; | ||
93 | ts << "audio.out_num_audio_buf:16\n"; | ||
94 | ts << "audio.out_size_audio_buf:8096\n"; | ||
95 | ts << "audio.out_size_zero_buf:1024\n"; | ||
96 | ts << "audio.passthrough_offset:0\n"; | ||
91 | f.close(); | 97 | f.close(); |
92 | } | 98 | } |
93 | 99 | ||
94 | if ( initMode == InitializeImmediately ) { | 100 | if ( initMode == InitializeImmediately ) { |
@@ -138,9 +144,9 @@ void Lib::initialize() | |||
138 | m_queue = xine_event_new_queue (m_stream); | 144 | m_queue = xine_event_new_queue (m_stream); |
139 | 145 | ||
140 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); | 146 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); |
141 | 147 | ||
142 | ::null_preload_decoders( m_stream ); | 148 | ::null_preload_decoders( m_stream ); |
143 | 149 | ||
144 | m_duringInitialization = false; | 150 | m_duringInitialization = false; |
145 | } | 151 | } |
146 | 152 | ||
@@ -190,10 +196,18 @@ int Lib::subVersion() { | |||
190 | } | 196 | } |
191 | 197 | ||
192 | int Lib::play( const QString& fileName, int startPos, int start_time ) { | 198 | int Lib::play( const QString& fileName, int startPos, int start_time ) { |
193 | assert( m_initialized ); | 199 | assert( m_initialized ); |
200 | // FIXME actually a hack imho. Should not be needed to dispose the whole stream | ||
201 | // but without we get wrong media length reads from libxine for the second media | ||
202 | //xine_dispose ( m_stream ); | ||
194 | 203 | ||
195 | QString str = fileName.stripWhiteSpace(); | 204 | QString str = fileName.stripWhiteSpace(); |
205 | |||
206 | //m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); | ||
207 | //m_queue = xine_event_new_queue (m_stream); | ||
208 | //xine_event_create_listener_thread (m_queue, xine_event_handler, this); | ||
209 | |||
196 | if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) { | 210 | if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) { |
197 | return 0; | 211 | return 0; |
198 | } | 212 | } |
199 | return xine_play( m_stream, startPos, start_time); | 213 | return xine_play( m_stream, startPos, start_time); |
@@ -242,17 +256,38 @@ int Lib::currentTime() const { | |||
242 | assert( m_initialized ); | 256 | assert( m_initialized ); |
243 | 257 | ||
244 | int pos, time, length; | 258 | int pos, time, length; |
245 | xine_get_pos_length( m_stream, &pos, &time, &length ); | 259 | xine_get_pos_length( m_stream, &pos, &time, &length ); |
246 | return time/1000; | 260 | if ( time > 0 ) { |
261 | return time/1000; | ||
262 | } else { | ||
263 | return 0; | ||
264 | } | ||
247 | } | 265 | } |
248 | 266 | ||
249 | int Lib::length() const { | 267 | int Lib::length() const { |
250 | assert( m_initialized ); | 268 | assert( m_initialized ); |
251 | 269 | ||
252 | int pos, time, length; | 270 | int pos, time, length; |
253 | xine_get_pos_length( m_stream, &pos, &time, &length ); | 271 | /* dilb: patch to solve the wrong stream length reported to the GUI*/ |
254 | return length/1000; | 272 | int iRetVal=0, iTestLoop=0; |
273 | |||
274 | do | ||
275 | { | ||
276 | iRetVal = xine_get_pos_length( m_stream, &pos, &time, &length ); | ||
277 | if (iRetVal) | ||
278 | {/* if the function didn't return 0, then pos, time and length are valid.*/ | ||
279 | return length/1000; | ||
280 | } | ||
281 | /*don't poll too much*/ | ||
282 | usleep(100000); | ||
283 | iTestLoop++; | ||
284 | } | ||
285 | while ( iTestLoop < 10 ); /* if after 1s, we still don't have any | ||
286 | valid stream, then return -1 (this value could be used to make the stream | ||
287 | unseekable, but it should never occur!! Mr. Murphy ? :) ) */ | ||
288 | |||
289 | return -1; | ||
255 | } | 290 | } |
256 | 291 | ||
257 | bool Lib::isSeekable() const { | 292 | bool Lib::isSeekable() const { |
258 | assert( m_initialized ); | 293 | assert( m_initialized ); |
@@ -365,11 +400,9 @@ void Lib::setScaling( bool scale ) { | |||
365 | 400 | ||
366 | void Lib::setGamma( int value ) { | 401 | void Lib::setGamma( int value ) { |
367 | assert( m_initialized ); | 402 | assert( m_initialized ); |
368 | 403 | ||
369 | //qDebug( QString( "%1").arg(value) ); | 404 | ::null_set_videoGamma( m_videoOutput, value ); |
370 | /* int gammaValue = ( 100 + value ); */ | ||
371 | ::null_set_videoGamma( m_videoOutput, value ); | ||
372 | } | 405 | } |
373 | 406 | ||
374 | bool Lib::isScaling() const { | 407 | bool Lib::isScaling() const { |
375 | assert( m_initialized ); | 408 | assert( m_initialized ); |
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index 181735c..0ff14d0 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h | |||
@@ -33,14 +33,9 @@ | |||
33 | 33 | ||
34 | #ifndef ZECKEXINELIB_H | 34 | #ifndef ZECKEXINELIB_H |
35 | #define ZECKEXINELIB_H | 35 | #define ZECKEXINELIB_H |
36 | 36 | ||
37 | #include <qcstring.h> | ||
38 | #include <qstring.h> | ||
39 | #include <qobject.h> | ||
40 | |||
41 | #include <xine.h> | 37 | #include <xine.h> |
42 | //#include "xine.h" | ||
43 | 38 | ||
44 | #include "threadutil.h" | 39 | #include "threadutil.h" |
45 | 40 | ||
46 | class XineVideoWidget; | 41 | class XineVideoWidget; |
diff --git a/noncore/multimedia/opieplayer2/mediadetect.cpp b/noncore/multimedia/opieplayer2/mediadetect.cpp deleted file mode 100644 index 91137db..0000000 --- a/noncore/multimedia/opieplayer2/mediadetect.cpp +++ b/dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | #include <qstring.h> | ||
2 | #include "mediadetect.h" | ||
3 | |||
4 | |||
5 | MediaDetect::MediaDetect() { | ||
6 | } | ||
7 | |||
8 | MediaDetect::~MediaDetect() { | ||
9 | } | ||
10 | |||
11 | char MediaDetect::videoOrAudio( const QString& fileName ) { | ||
12 | if( (fileName.lower()).right(4) == ".avi" || | ||
13 | (fileName.lower()).right(4) == ".mpg" || | ||
14 | (fileName.lower()).right(4) == ".asf" || | ||
15 | (fileName.lower()).right(4) == ".mov" || | ||
16 | (fileName.lower()).right(5) == ".mpeg" ) { | ||
17 | qDebug("Video out taken"); | ||
18 | return 'v'; | ||
19 | } else if ( (fileName.lower()).right(4) == "·mp1" || | ||
20 | (fileName.lower()).right(4) == ".mp3" || | ||
21 | (fileName.lower()).right(4) == ".ogg" || | ||
22 | (fileName.lower()).right(4) == ".wav" ) { | ||
23 | qDebug("AUDIO out taken"); | ||
24 | return 'a'; | ||
25 | } else if ( (fileName.lower()).left(7) == "http://" && | ||
26 | (fileName.lower()).right(1) == "/" ) { | ||
27 | return 'a'; | ||
28 | } else { | ||
29 | return 'f'; | ||
30 | } | ||
31 | } | ||
32 | |||
33 | bool MediaDetect::isStreaming( const QString& fileName ) { | ||
34 | // ugly | ||
35 | if( (fileName.lower()).left(4) == "http" ) { | ||
36 | return true; | ||
37 | } else if ( (fileName.lower()).left(3) == "ftp" ) { | ||
38 | return true; | ||
39 | } else { | ||
40 | return false; | ||
41 | } | ||
42 | } | ||
43 | |||
diff --git a/noncore/multimedia/opieplayer2/mediadetect.h b/noncore/multimedia/opieplayer2/mediadetect.h deleted file mode 100644 index bd5ea1d..0000000 --- a/noncore/multimedia/opieplayer2/mediadetect.h +++ b/dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | |||
2 | #ifndef MEDIADETECT_H | ||
3 | #define MEDIADETECT_H | ||
4 | |||
5 | |||
6 | class QString; | ||
7 | class MediaDetect { | ||
8 | |||
9 | public: | ||
10 | MediaDetect(); | ||
11 | ~MediaDetect(); | ||
12 | |||
13 | /** | ||
14 | * Look at the filename and decide which gui is to be used | ||
15 | * | ||
16 | * @param filename the filename | ||
17 | * @return the char - a for audio gui, v for video, f for error | ||
18 | */ | ||
19 | char videoOrAudio( const QString& fileName ); | ||
20 | |||
21 | /** | ||
22 | * Find out if it is a streaming media file | ||
23 | * | ||
24 | * @param filename the filename | ||
25 | * @return if it is a streaming url or not | ||
26 | */ | ||
27 | bool isStreaming( const QString& fileName ); | ||
28 | |||
29 | }; | ||
30 | |||
31 | #endif | ||
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index d4396d2..9f51006 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -1,16 +1,9 @@ | |||
1 | #include <qpe/qpeapplication.h> | 1 | #include <qpe/qpeapplication.h> |
2 | #include <qpe/qlibrary.h> | ||
3 | #include <qpe/resource.h> | ||
4 | #include <qpe/config.h> | 2 | #include <qpe/config.h> |
5 | #include <qpe/qcopenvelope_qws.h> | 3 | #include <qpe/qcopenvelope_qws.h> |
6 | #include <qfileinfo.h> | 4 | #include <qfileinfo.h> |
7 | 5 | ||
8 | #include <qmainwindow.h> | ||
9 | #include <qmessagebox.h> | ||
10 | #include <qwidgetstack.h> | ||
11 | #include <qfile.h> | ||
12 | |||
13 | #include "mediaplayer.h" | 6 | #include "mediaplayer.h" |
14 | #include "playlistwidget.h" | 7 | #include "playlistwidget.h" |
15 | #include "audiowidget.h" | 8 | #include "audiowidget.h" |
16 | #include "videowidget.h" | 9 | #include "videowidget.h" |
@@ -18,16 +11,14 @@ | |||
18 | #include "lib.h" | 11 | #include "lib.h" |
19 | 12 | ||
20 | #include "mediaplayerstate.h" | 13 | #include "mediaplayerstate.h" |
21 | 14 | ||
22 | // for setBacklight() | 15 | // for setBacklight() |
23 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
24 | #include <sys/file.h> | 17 | #include <sys/file.h> |
25 | #include <sys/ioctl.h> | 18 | #include <sys/ioctl.h> |
26 | 19 | ||
27 | 20 | ||
28 | |||
29 | |||
30 | #define FBIOBLANK 0x4611 | 21 | #define FBIOBLANK 0x4611 |
31 | 22 | ||
32 | MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) | 23 | MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) |
33 | : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) { | 24 | : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) { |
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h index cbe4d86..34ff064 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.h +++ b/noncore/multimedia/opieplayer2/mediaplayer.h | |||
@@ -33,11 +33,8 @@ | |||
33 | 33 | ||
34 | #ifndef MEDIA_PLAYER_H | 34 | #ifndef MEDIA_PLAYER_H |
35 | #define MEDIA_PLAYER_H | 35 | #define MEDIA_PLAYER_H |
36 | 36 | ||
37 | #include <qmainwindow.h> | ||
38 | #include <qframe.h> | ||
39 | |||
40 | #include "xinecontrol.h" | 37 | #include "xinecontrol.h" |
41 | 38 | ||
42 | #include "playlistwidget.h" | 39 | #include "playlistwidget.h" |
43 | #include "skin.h" | 40 | #include "skin.h" |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 3953d92..b1f88c9 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -19,8 +19,10 @@ | |||
19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
20 | Boston, MA 02111-1307, USA. | 20 | Boston, MA 02111-1307, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <assert.h> | ||
24 | |||
23 | #include "mediawidget.h" | 25 | #include "mediawidget.h" |
24 | #include "playlistwidget.h" | 26 | #include "playlistwidget.h" |
25 | #include "skin.h" | 27 | #include "skin.h" |
26 | 28 | ||
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp index 841d950..7183fb4 100644 --- a/noncore/multimedia/opieplayer2/om3u.cpp +++ b/noncore/multimedia/opieplayer2/om3u.cpp | |||
@@ -73,17 +73,11 @@ void Om3u::readM3u() { | |||
73 | s=s.replace( QRegExp( "\\" ), "/" ); | 73 | s=s.replace( QRegExp( "\\" ), "/" ); |
74 | append(s); | 74 | append(s); |
75 | // qDebug(s); | 75 | // qDebug(s); |
76 | } else { // is url | 76 | } else { // is url |
77 | s.replace( QRegExp( "%20" )," " ); | ||
78 | QString name; | 77 | QString name; |
79 | // if( name.left( 4 ) == "http" ) { | 78 | name = s; |
80 | // name = s.right( s.length() - 7 ); | ||
81 | // } else { | ||
82 | name = s; | ||
83 | // } | ||
84 | append(name); | 79 | append(name); |
85 | // qDebug(name); | ||
86 | } | 80 | } |
87 | } | 81 | } |
88 | } | 82 | } |
89 | } | 83 | } |
@@ -146,9 +140,9 @@ void Om3u::remove(const QString &filePath) { //removes from m3u list | |||
146 | if(count()>0) { | 140 | if(count()>0) { |
147 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { | 141 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { |
148 | currentFile=*it; | 142 | currentFile=*it; |
149 | // qDebug(*it); | 143 | // qDebug(*it); |
150 | 144 | ||
151 | if( filePath != currentFile) | 145 | if( filePath != currentFile) |
152 | list += currentFile+"\n"; | 146 | list += currentFile+"\n"; |
153 | } | 147 | } |
154 | f.writeBlock( list, list.length() ); | 148 | f.writeBlock( list, list.length() ); |
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control new file mode 100644 index 0000000..0e71fc5 --- a/dev/null +++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control | |||
@@ -0,0 +1,10 @@ | |||
1 | Package: opie-mediaplayer2-codecs | ||
2 | Files: root/usr/lib/libao.so* root/usr/lib/libogg* root/usr/lib/libvorbisidec.so* root/usr/lib/libxine.so* root/usr/lib/xine/* | ||
3 | Section: opie/multimedia | ||
4 | Essential: no | ||
5 | Priority: optional | ||
6 | Version: 0.7-$SUB_VERSION.3 | ||
7 | Architecture: arm | ||
8 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> | ||
9 | Depends: libc6 (>= 2.1), opie-mediaplayer2 | ||
10 | Description: Codecs for opieplayer 2 | ||
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.postinst b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.postinst new file mode 100755 index 0000000..8e60212 --- a/dev/null +++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.postinst | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | [ "$1" = "configure" ] || exit 1 | ||
4 | |||
5 | ldconfig \ No newline at end of file | ||
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control index c072308..10c5d19 100644 --- a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control +++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control | |||
@@ -3,9 +3,9 @@ Files: bin/opieplayer2 apps/Applications/mediaplayer.desktop pics/opieplayer2/a | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: L.J.Potter <ljp@llornkcor.com>, Maximilian Reiss <harlekin@handhelds.org> | 5 | Maintainer: L.J.Potter <ljp@llornkcor.com>, Maximilian Reiss <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | 7 | Depends: task-opie-minimal, libopie1, zlib1g, libstdc++2.10-glibc2.2, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape , libxine1 | opie-mediaplayer2-codecs |
8 | Depends: task-opie-minimal, libopie1, zlib1g, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape , libxine1 | opie-mediaplayer-codecs | ||
9 | Description: The Opie media player | 8 | Description: The Opie media player |
10 | The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and | 9 | The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and |
11 | more. Also it is streaming capable. | 10 | more. Also it is streaming capable. |
11 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro index 57cd18f..5dabbab 100644 --- a/noncore/multimedia/opieplayer2/opieplayer2.pro +++ b/noncore/multimedia/opieplayer2/opieplayer2.pro | |||
@@ -10,9 +10,9 @@ SOURCES = main.cpp \ | |||
10 | playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \ | 10 | playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \ |
11 | videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \ | 11 | videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \ |
12 | frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \ | 12 | frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \ |
13 | playlistwidgetgui.cpp\ | 13 | playlistwidgetgui.cpp\ |
14 | alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \ | 14 | alphablend.c yuv2rgb.c yuv2rgb_arm2.c yuv2rgb_arm4l.S \ |
15 | threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \ | 15 | threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \ |
16 | skin.cpp | 16 | skin.cpp |
17 | TARGET = opieplayer2 | 17 | TARGET = opieplayer2 |
18 | INCLUDEPATH += $(OPIEDIR)/include | 18 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 5f750ba..a1a1016 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -30,23 +30,13 @@ | |||
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 <qtoolbar.h> |
35 | #include <qpe/qpeapplication.h> | ||
36 | #include <qpe/storage.h> | ||
37 | #include <qpe/mimetype.h> | ||
38 | #include <qpe/global.h> | ||
39 | #include <qpe/resource.h> | ||
40 | #include <qpe/config.h> | ||
41 | 35 | ||
42 | #include <opie/ofiledialog.h> | 36 | #include <opie/ofiledialog.h> |
43 | 37 | ||
44 | #include <qdatetime.h> | ||
45 | #include <qdir.h> | ||
46 | #include <qmessagebox.h> | 38 | #include <qmessagebox.h> |
47 | #include <qregexp.h> | ||
48 | #include <qtextstream.h> | ||
49 | 39 | ||
50 | #include "playlistselection.h" | 40 | #include "playlistselection.h" |
51 | #include "playlistwidget.h" | 41 | #include "playlistwidget.h" |
52 | #include "mediaplayerstate.h" | 42 | #include "mediaplayerstate.h" |
@@ -54,9 +44,8 @@ | |||
54 | #include "om3u.h" | 44 | #include "om3u.h" |
55 | #include "playlistfileview.h" | 45 | #include "playlistfileview.h" |
56 | 46 | ||
57 | //only needed for the random play | 47 | //only needed for the random play |
58 | #include <stdlib.h> | ||
59 | #include <assert.h> | 48 | #include <assert.h> |
60 | 49 | ||
61 | PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) | 50 | PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) |
62 | : PlayListWidgetGui( mediaPlayerState, parent, name ) , currentFileListView( 0 ) | 51 | : PlayListWidgetGui( mediaPlayerState, parent, name ) , currentFileListView( 0 ) |
@@ -666,8 +655,9 @@ void PlayListWidget::openFile() { | |||
666 | MimeTypes types; | 655 | MimeTypes types; |
667 | QStringList audio, video, all; | 656 | QStringList audio, video, all; |
668 | audio << "audio/*"; | 657 | audio << "audio/*"; |
669 | audio << "playlist/plain"; | 658 | audio << "playlist/plain"; |
659 | audio << "application/ogg"; | ||
670 | audio << "audio/x-mpegurl"; | 660 | audio << "audio/x-mpegurl"; |
671 | 661 | ||
672 | video << "video/*"; | 662 | video << "video/*"; |
673 | video << "playlist/plain"; | 663 | video << "playlist/plain"; |
@@ -678,29 +668,30 @@ void PlayListWidget::openFile() { | |||
678 | types.insert("Audio", audio ); | 668 | types.insert("Audio", audio ); |
679 | types.insert("Video", video ); | 669 | types.insert("Video", video ); |
680 | 670 | ||
681 | QString str = OFileDialog::getOpenFileName( 1, | 671 | QString str = OFileDialog::getOpenFileName( 1, |
682 | cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"", | 672 | cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"", |
683 | types, 0 ); | 673 | types, 0 ); |
684 | if(str.left(2) == "//") str=str.right(str.length()-1); | ||
685 | cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath()); | ||
686 | 674 | ||
675 | if(str.left(2) == "//") { | ||
676 | str=str.right(str.length()-1); | ||
677 | } | ||
678 | cfg.writeEntry( "LastDirectory" ,QFileInfo( str ).dirPath() ); | ||
687 | 679 | ||
688 | if( !str.isEmpty() ) { | 680 | if( !str.isEmpty() ) { |
681 | |||
689 | qDebug( "Selected filename is " + str ); | 682 | qDebug( "Selected filename is " + str ); |
690 | filename = str; | 683 | filename = str; |
691 | DocLnk lnk; | 684 | DocLnk lnk; |
692 | Config cfg( "OpiePlayer" ); | ||
693 | cfg.setGroup("PlayList"); | ||
694 | 685 | ||
695 | if( filename.right( 3) == "m3u" || filename.right(3) == "pls" ) { | 686 | if( filename.right( 3) == "m3u" || filename.right(3) == "pls" ) { |
696 | readListFromFile( filename ); | 687 | readListFromFile( filename ); |
697 | } else { | 688 | } else { |
698 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 689 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
699 | lnk.setFile( filename ); //sets file name | 690 | lnk.setFile( filename ); //sets file name |
700 | d->selectedFiles->addToSelection( lnk); | 691 | d->selectedFiles->addToSelection( lnk ); |
701 | writeCurrentM3u(); | 692 | writeCurrentM3u(); |
702 | d->selectedFiles->setSelectedItem( lnk.name()); | 693 | d->selectedFiles->setSelectedItem( lnk.name() ); |
703 | } | 694 | } |
704 | } | 695 | } |
705 | } | 696 | } |
706 | 697 | ||
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h index 5230b03..fc305cd 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.h +++ b/noncore/multimedia/opieplayer2/playlistwidget.h | |||
@@ -33,20 +33,15 @@ | |||
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 | |
38 | #include <qpe/applnk.h> | ||
39 | #include <qtabwidget.h> | ||
40 | #include <qpe/fileselector.h> | ||
41 | #include <qpushbutton.h> | 38 | #include <qpushbutton.h> |
42 | #include <qpopupmenu.h> | 39 | #include <qpopupmenu.h> |
43 | #include <qpe/qcopenvelope_qws.h> | 40 | #include <qpe/qcopenvelope_qws.h> |
44 | 41 | ||
45 | #include "playlistwidgetgui.h" | 42 | #include "playlistwidgetgui.h" |
46 | 43 | ||
47 | |||
48 | //class PlayListWidgetPrivate; | ||
49 | class Config; | 44 | class Config; |
50 | class QListViewItem; | 45 | class QListViewItem; |
51 | class QListView; | 46 | class QListView; |
52 | class QPoint; | 47 | class QPoint; |
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp index 5fc0c39..293bf45 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | |||
@@ -30,33 +30,21 @@ | |||
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <qpe/qpemenubar.h> | 34 | |
35 | #include <qpe/qpetoolbar.h> | 35 | #include <qtoolbar.h> |
36 | #include <qpe/fileselector.h> | ||
37 | #include <qpe/qpeapplication.h> | 36 | #include <qpe/qpeapplication.h> |
38 | #include <qpe/storage.h> | 37 | |
39 | #include <qpe/mimetype.h> | ||
40 | #include <qpe/config.h> | ||
41 | #include <qpe/global.h> | ||
42 | #include <qpe/resource.h> | ||
43 | |||
44 | #include <qpopupmenu.h> | ||
45 | #include <qaction.h> | ||
46 | #include <qcursor.h> | ||
47 | #include <qdir.h> | ||
48 | #include <qlayout.h> | 38 | #include <qlayout.h> |
39 | #include <qmenubar.h> | ||
49 | 40 | ||
50 | #include "playlistselection.h" | 41 | #include "playlistselection.h" |
51 | #include "playlistwidget.h" | 42 | #include "playlistwidget.h" |
52 | #include "mediaplayerstate.h" | 43 | #include "mediaplayerstate.h" |
53 | #include "inputDialog.h" | 44 | #include "inputDialog.h" |
54 | #include "playlistfileview.h" | 45 | #include "playlistfileview.h" |
55 | 46 | ||
56 | //only needed for the random play | ||
57 | #include <stdlib.h> | ||
58 | |||
59 | #include "mediaplayerstate.h" | 47 | #include "mediaplayerstate.h" |
60 | 48 | ||
61 | PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent, const char* name ) | 49 | PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent, const char* name ) |
62 | : QMainWindow( parent, name ), mediaPlayerState( _mediaPlayerState ) { | 50 | : QMainWindow( parent, name ), mediaPlayerState( _mediaPlayerState ) { |
@@ -67,16 +55,16 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg | |||
67 | setBackgroundMode( PaletteButton ); | 55 | setBackgroundMode( PaletteButton ); |
68 | setToolBarsMovable( FALSE ); | 56 | setToolBarsMovable( FALSE ); |
69 | 57 | ||
70 | // Create Toolbar | 58 | // Create Toolbar |
71 | QPEToolBar *toolbar = new QPEToolBar( this ); | 59 | QToolBar *toolbar = new QToolBar( this ); |
72 | toolbar->setHorizontalStretchable( TRUE ); | 60 | toolbar->setHorizontalStretchable( TRUE ); |
73 | 61 | ||
74 | // Create Menubar | 62 | // Create Menubar |
75 | QPEMenuBar *menu = new QPEMenuBar( toolbar ); | 63 | QMenuBar *menu = new QMenuBar( toolbar ); |
76 | menu->setMargin( 0 ); | 64 | menu->setMargin( 0 ); |
77 | 65 | ||
78 | bar = new QPEToolBar( this ); | 66 | bar = new QToolBar( this ); |
79 | bar->setLabel( tr( "Play Operations" ) ); | 67 | bar->setLabel( tr( "Play Operations" ) ); |
80 | 68 | ||
81 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" ); | 69 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" ); |
82 | tbDeletePlaylist->setFlat( TRUE ); | 70 | tbDeletePlaylist->setFlat( TRUE ); |
@@ -147,9 +135,9 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg | |||
147 | QGridLayout *Alayout = new QGridLayout( aTab ); | 135 | QGridLayout *Alayout = new QGridLayout( aTab ); |
148 | Alayout->setSpacing( 2 ); | 136 | Alayout->setSpacing( 2 ); |
149 | Alayout->setMargin( 2 ); | 137 | Alayout->setMargin( 2 ); |
150 | // no m3u's here please | 138 | // no m3u's here please |
151 | audioView = new PlayListFileView( "audio/mpeg;audio/x-wav;audio/x-ogg", "opieplayer2/musicfile", aTab, "Audioview" ); | 139 | audioView = new PlayListFileView( "audio/mpeg;audio/x-wav;application/ogg", "opieplayer2/musicfile", aTab, "Audioview" ); |
152 | Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 ); | 140 | Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 ); |
153 | tabWidget->insertTab( aTab, tr( "Audio" ) ); | 141 | tabWidget->insertTab( aTab, tr( "Audio" ) ); |
154 | 142 | ||
155 | QPEApplication::setStylusOperation( audioView->viewport(), QPEApplication::RightOnHold ); | 143 | QPEApplication::setStylusOperation( audioView->viewport(), QPEApplication::RightOnHold ); |
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h index c965b0d..c0cd37a 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h | |||
@@ -34,17 +34,14 @@ | |||
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> | ||
39 | #include <qpe/resource.h> | 38 | #include <qpe/resource.h> |
40 | #include <qpe/qpemenubar.h> | ||
41 | 39 | ||
42 | #include <qtabwidget.h> | 40 | #include <qtabwidget.h> |
43 | #include <qpe/fileselector.h> | 41 | #include <qpe/fileselector.h> |
44 | #include <qpushbutton.h> | ||
45 | #include <qpopupmenu.h> | ||
46 | #include <qaction.h> | 42 | #include <qaction.h> |
43 | #include <qtoolbutton.h> | ||
47 | #include <qslider.h> | 44 | #include <qslider.h> |
48 | #include <qlcdnumber.h> | 45 | #include <qlcdnumber.h> |
49 | 46 | ||
50 | class PlayListWidgetPrivate; | 47 | class PlayListWidgetPrivate; |
@@ -52,9 +49,9 @@ class PlayListSelection; | |||
52 | class MediaPlayerState; | 49 | class MediaPlayerState; |
53 | class PlayListFileView; | 50 | class PlayListFileView; |
54 | 51 | ||
55 | class Config; | 52 | class Config; |
56 | class QPEToolBar; | 53 | class QToolBar; |
57 | class QListViewItem; | 54 | class QListViewItem; |
58 | class QListView; | 55 | class QListView; |
59 | class QPoint; | 56 | class QPoint; |
60 | class QAction; | 57 | class QAction; |
@@ -79,9 +76,8 @@ public: | |||
79 | setAutoRaise( TRUE ); | 76 | setAutoRaise( TRUE ); |
80 | setFocusPolicy( QWidget::NoFocus ); | 77 | setFocusPolicy( QWidget::NoFocus ); |
81 | setToggleButton( t ); | 78 | setToggleButton( t ); |
82 | connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); | 79 | connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); |
83 | QPEMenuToolFocusManager::manager()->addWidget( this ); | ||
84 | } | 80 | } |
85 | }; | 81 | }; |
86 | 82 | ||
87 | class MenuItem : public QAction { | 83 | class MenuItem : public QAction { |
@@ -120,9 +116,9 @@ protected: | |||
120 | QPopupMenu *skinsMenu; | 116 | QPopupMenu *skinsMenu; |
121 | PlayListWidgetPrivate *d; // Private implementation data | 117 | PlayListWidgetPrivate *d; // Private implementation data |
122 | QVBox *vbox1; | 118 | QVBox *vbox1; |
123 | QVBox *vbox5; | 119 | QVBox *vbox5; |
124 | QPEToolBar *bar; | 120 | QToolBar *bar; |
125 | QWidget *playListTab; | 121 | QWidget *playListTab; |
126 | void setActiveWindow(); // need to handle this to show the right view | 122 | void setActiveWindow(); // need to handle this to show the right view |
127 | void setView( char ); | 123 | void setView( char ); |
128 | 124 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 755cd22..c829e03 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -30,18 +30,8 @@ | |||
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <qpe/qpeapplication.h> | ||
35 | #include <qpe/resource.h> | ||
36 | #include <qpe/config.h> | ||
37 | |||
38 | |||
39 | #include <qwidget.h> | ||
40 | #include <qpainter.h> | ||
41 | #include <qpixmap.h> | ||
42 | #include <qslider.h> | ||
43 | #include <qdrawutil.h> | ||
44 | #include "videowidget.h" | 34 | #include "videowidget.h" |
45 | #include "mediaplayerstate.h" | 35 | #include "mediaplayerstate.h" |
46 | #include "playlistwidget.h" | 36 | #include "playlistwidget.h" |
47 | 37 | ||
@@ -73,9 +63,9 @@ const MediaWidget::SkinButtonInfo skinInfo[] = | |||
73 | const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); | 63 | const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); |
74 | 64 | ||
75 | } | 65 | } |
76 | 66 | ||
77 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) | 67 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) |
78 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ), videoSliderBeingMoved( false ) | 68 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ), videoSliderBeingMoved( false ) |
79 | { | 69 | { |
80 | setCaption( tr("OpiePlayer - Video") ); | 70 | setCaption( tr("OpiePlayer - Video") ); |
81 | 71 | ||
@@ -94,9 +84,9 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
94 | setPlaying( mediaPlayerState.isPlaying() ); | 84 | setPlaying( mediaPlayerState.isPlaying() ); |
95 | } | 85 | } |
96 | 86 | ||
97 | 87 | ||
98 | VideoWidget::~VideoWidget() | 88 | VideoWidget::~VideoWidget() |
99 | { | 89 | { |
100 | } | 90 | } |
101 | 91 | ||
102 | MediaWidget::GUIInfo VideoWidget::guiInfo() | 92 | MediaWidget::GUIInfo VideoWidget::guiInfo() |
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index 84bc964..8c6896b 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -33,13 +33,9 @@ | |||
33 | 33 | ||
34 | #ifndef VIDEO_WIDGET_H | 34 | #ifndef VIDEO_WIDGET_H |
35 | #define VIDEO_WIDGET_H | 35 | #define VIDEO_WIDGET_H |
36 | 36 | ||
37 | #include <qwidget.h> | ||
38 | #include <qimage.h> | ||
39 | #include <qpixmap.h> | ||
40 | #include "xinevideowidget.h" | 37 | #include "xinevideowidget.h" |
41 | |||
42 | #include "mediawidget.h" | 38 | #include "mediawidget.h" |
43 | 39 | ||
44 | class QPixmap; | 40 | class QPixmap; |
45 | class QSlider; | 41 | class QSlider; |
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index 1c489e3..a392f4a 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp | |||
@@ -35,24 +35,25 @@ | |||
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 | |||
39 | #include "xinecontrol.h" | 40 | #include "xinecontrol.h" |
40 | #include "mediaplayerstate.h" | 41 | #include "mediaplayerstate.h" |
41 | #include "xinevideowidget.h" | 42 | #include "xinevideowidget.h" |
42 | 43 | ||
43 | XineControl::XineControl( XineVideoWidget *xineWidget, | 44 | XineControl::XineControl( XineVideoWidget *xineWidget, |
44 | MediaPlayerState &_mediaPlayerState, | 45 | MediaPlayerState &_mediaPlayerState, |
45 | QObject *parent, const char *name ) | 46 | QObject *parent, const char *name ) |
46 | : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget ) | 47 | : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget ) |
47 | { | 48 | { |
48 | libXine = new XINE::Lib( XINE::Lib::InitializeImmediately, xineWidget ); | 49 | libXine = new XINE::Lib( XINE::Lib::InitializeImmediately, xineWidget ); |
49 | 50 | ||
50 | init(); | 51 | init(); |
51 | } | 52 | } |
52 | 53 | ||
53 | XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, | 54 | XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, |
54 | MediaPlayerState &_mediaPlayerState, | 55 | MediaPlayerState &_mediaPlayerState, |
55 | QObject *parent, const char *name ) | 56 | QObject *parent, const char *name ) |
56 | : QObject( parent, name ), libXine( xine ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget ) | 57 | : QObject( parent, name ), libXine( xine ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget ) |
57 | { | 58 | { |
58 | xine->ensureInitialized(); | 59 | xine->ensureInitialized(); |
@@ -87,8 +88,9 @@ XineControl::~XineControl() { | |||
87 | delete libXine; | 88 | delete libXine; |
88 | } | 89 | } |
89 | 90 | ||
90 | void XineControl::play( const QString& fileName ) { | 91 | void XineControl::play( const QString& fileName ) { |
92 | |||
91 | hasVideoChannel = FALSE; | 93 | hasVideoChannel = FALSE; |
92 | hasAudioChannel = FALSE; | 94 | hasAudioChannel = FALSE; |
93 | m_fileName = fileName; | 95 | m_fileName = fileName; |
94 | 96 | ||
@@ -102,9 +104,8 @@ void XineControl::play( const QString& fileName ) { | |||
102 | } | 104 | } |
103 | mediaPlayerState.setPlaying( true ); | 105 | mediaPlayerState.setPlaying( true ); |
104 | 106 | ||
105 | MediaPlayerState::DisplayType displayType; | 107 | MediaPlayerState::DisplayType displayType; |
106 | // qDebug( QString( "libXine->hasVideo() return : %1 ").arg( libXine->hasVideo() ) ); | ||
107 | if ( !libXine->hasVideo() ) { | 108 | if ( !libXine->hasVideo() ) { |
108 | displayType = MediaPlayerState::Audio; | 109 | displayType = MediaPlayerState::Audio; |
109 | qDebug("HAS AUDIO"); | 110 | qDebug("HAS AUDIO"); |
110 | libXine->setShowVideo( false ); | 111 | libXine->setShowVideo( false ); |
@@ -196,9 +197,8 @@ long XineControl::position() { | |||
196 | if( mediaPlayerState.isPlaying() ) { | 197 | if( mediaPlayerState.isPlaying() ) { |
197 | // needs to be stopped the media is stopped | 198 | // needs to be stopped the media is stopped |
198 | QTimer::singleShot( 1000, this, SLOT( position() ) ); | 199 | QTimer::singleShot( 1000, this, SLOT( position() ) ); |
199 | } | 200 | } |
200 | // qDebug("POSITION : %d", m_position); | ||
201 | return m_position; | 201 | return m_position; |
202 | } | 202 | } |
203 | 203 | ||
204 | /** | 204 | /** |
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h index 0e985d6..3f44f2e 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.h +++ b/noncore/multimedia/opieplayer2/xinecontrol.h | |||
@@ -34,9 +34,8 @@ | |||
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 <qobject.h> | ||
39 | 38 | ||
40 | #include "mediaplayerstate.h" | 39 | #include "mediaplayerstate.h" |
41 | 40 | ||
42 | class XineControl : public QObject { | 41 | class XineControl : public QObject { |
diff --git a/noncore/multimedia/opieplayer2/yuv2rgb_arm2.c b/noncore/multimedia/opieplayer2/yuv2rgb_arm2.c new file mode 100644 index 0000000..cbd32e8 --- a/dev/null +++ b/noncore/multimedia/opieplayer2/yuv2rgb_arm2.c | |||
@@ -0,0 +1,875 @@ | |||
1 | /* | ||
2 | * yuv2rgb_arm2.c | ||
3 | * Copyright (C) 2002 Frederic 'dilb' Boulay. | ||
4 | * All Rights Reserved. | ||
5 | * | ||
6 | * Author: Frederic Boulay <dilb@handhelds.org> | ||
7 | * | ||
8 | * you can redistribute this file and/or modify | ||
9 | * it under the terms of the GNU General Public License (version 2) | ||
10 | * as published by the Free Software Foundation. | ||
11 | * | ||
12 | * This file is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | * | ||
21 | * | ||
22 | * The function defined in this file, are derived from work done in the xine | ||
23 | * project. | ||
24 | * In order to improve performance, by strongly reducing memory bandwidth | ||
25 | * needed, the scaling functions are merged with the yuv2rgb function. | ||
26 | */ | ||
27 | |||
28 | #ifdef __arm__ | ||
29 | |||
30 | #include <stdio.h> | ||
31 | #include <stdlib.h> | ||
32 | #include <string.h> | ||
33 | #include <inttypes.h> | ||
34 | |||
35 | #include "yuv2rgb.h" | ||
36 | #include <xine/xineutils.h> | ||
37 | |||
38 | /* Prototypes of the "local" functions available here: */ | ||
39 | /* first prototype, function called when no scaling is needed: */ | ||
40 | static void arm_rgb16_noscale(yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*); | ||
41 | /* second prototype, function called when no horizontal scaling is needed: */ | ||
42 | static void arm_rgb16_step_dx_32768(yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*); | ||
43 | /* third prototype, function called when scaling is needed for zooming in: */ | ||
44 | static void arm_rgb16_step_dx_inf_32768(yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*); | ||
45 | /* fourth prototype, function called when scaling is needed for zooming out (between 1x and 2x): */ | ||
46 | static void arm_rgb16_step_dx_bet_32768_65536(yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*); | ||
47 | /* fifth prototype, function called when scaling is needed for zooming out (greater than 2x): */ | ||
48 | static void arm_rgb16_step_dx_sup_65536(yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*); | ||
49 | /* sixth prototype, function where the decision of the scaling function to use is made.*/ | ||
50 | static void arm_rgb16_2 (yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*); | ||
51 | |||
52 | |||
53 | |||
54 | |||
55 | /* extern function: */ | ||
56 | |||
57 | /* Function: */ | ||
58 | void yuv2rgb_init_arm (yuv2rgb_factory_t *this) | ||
59 | /* This function initialise the member yuv2rgb_fun, if everything is right | ||
60 | the function optimised for the arm target should be used.*/ | ||
61 | { | ||
62 | if (this->swapped) | ||
63 | return; /*no swapped pixel output upto now*/ | ||
64 | |||
65 | switch (this->mode) | ||
66 | { | ||
67 | case MODE_16_RGB: | ||
68 | this->yuv2rgb_fun = arm_rgb16_2; | ||
69 | break; | ||
70 | default: | ||
71 | } | ||
72 | } | ||
73 | |||
74 | |||
75 | |||
76 | /* local functions: */ | ||
77 | |||
78 | /* Function: */ | ||
79 | static void arm_rgb16_2 (yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv) | ||
80 | /* This function takes care of applying the right scaling conversion | ||
81 | (yuv2rgb is included in each scaling function!)*/ | ||
82 | { | ||
83 | if (!this->do_scale) | ||
84 | { | ||
85 | arm_rgb16_noscale(this, _dst, _py, _pu, _pv); | ||
86 | return; | ||
87 | } | ||
88 | if (this->step_dx<32768) | ||
89 | { | ||
90 | arm_rgb16_step_dx_inf_32768(this, _dst, _py, _pu, _pv); | ||
91 | return; | ||
92 | } | ||
93 | if (this->step_dx==32768) | ||
94 | { | ||
95 | arm_rgb16_step_dx_32768(this, _dst, _py, _pu, _pv); | ||
96 | return; | ||
97 | } | ||
98 | if (this->step_dx<65536) | ||
99 | { | ||
100 | arm_rgb16_step_dx_bet_32768_65536(this, _dst, _py, _pu, _pv); | ||
101 | return; | ||
102 | } | ||
103 | arm_rgb16_step_dx_sup_65536(this, _dst, _py, _pu, _pv); | ||
104 | return; | ||
105 | } | ||
106 | |||
107 | |||
108 | /* Function: */ | ||
109 | static void arm_rgb16_noscale(yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv) | ||
110 | /* This function is called when the source and the destination pictures have the same size. | ||
111 | In this case, scaling part is not needed. | ||
112 | (This code is probably far from being optimised, in particular, the asm | ||
113 | generated is not the most efficient, a pure asm version will probably | ||
114 | emerge sooner or later). But at least, this version is faster than what | ||
115 | was used before.*/ | ||
116 | { | ||
117 | int height; | ||
118 | |||
119 | height=this->dest_height; | ||
120 | |||
121 | while (height>0) | ||
122 | { | ||
123 | uint16_t *r, *g, *b; | ||
124 | uint8_t *py, *py2, *pu, *pv; | ||
125 | uint16_t *dst, *dst2; | ||
126 | int width; | ||
127 | register uint8_t p1y, p1u, p1v; | ||
128 | |||
129 | height-=2; | ||
130 | width=this->dest_width; | ||
131 | dst = _dst; | ||
132 | dst2 = _dst + this->rgb_stride; | ||
133 | py = _py; | ||
134 | py2 = _py + this->y_stride; | ||
135 | pu = _pu; | ||
136 | pv = _pv; | ||
137 | |||
138 | while (width>0) | ||
139 | { | ||
140 | width-=2; | ||
141 | p1y=*py++; | ||
142 | p1u=*pu++; | ||
143 | p1v=*pv++; | ||
144 | |||
145 | r = this->table_rV[p1v]; | ||
146 | g = (void *) (((uint8_t *)this->table_gU[p1u]) + this->table_gV[p1v]); | ||
147 | b = this->table_bU[p1u]; | ||
148 | |||
149 | *dst++ = r[p1y] + g[p1y] + b[p1y]; | ||
150 | p1y=*py++; | ||
151 | *dst++ = r[p1y] + g[p1y] + b[p1y]; | ||
152 | |||
153 | p1y=*py2++; | ||
154 | |||
155 | *dst2++ = r[p1y] + g[p1y] + b[p1y]; | ||
156 | p1y=*py2++; | ||
157 | *dst2++ = r[p1y] + g[p1y] + b[p1y]; | ||
158 | } | ||
159 | _dst += (this->rgb_stride)<<1; | ||
160 | _py += (this->y_stride)<<1; | ||
161 | _pu += this->uv_stride; | ||
162 | _pv += this->uv_stride; | ||
163 | } | ||
164 | } | ||
165 | |||
166 | |||
167 | /* Function: */ | ||
168 | static void arm_rgb16_step_dx_inf_32768(yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv) | ||
169 | /* This function is called when the destination picture is bigger than the size | ||
170 | of the source picture. | ||
171 | */ | ||
172 | { | ||
173 | int recal_uv, height; /* Note about recal_uv: bit0 is for | ||
174 | applying scale on u and v, bit1 is for increments of u and v pointers.*/ | ||
175 | int dy; | ||
176 | |||
177 | dy = 0; | ||
178 | height = this->dest_height; | ||
179 | recal_uv=1; // 1 for evaluation of scale_line, needed the first time | ||
180 | |||
181 | while(1) | ||
182 | { | ||
183 | register int dxy; | ||
184 | register int dxuv; | ||
185 | register uint8_t p1y, p2y; | ||
186 | uint8_t dest1y, dest2y; | ||
187 | register uint8_t p1u, p2u; | ||
188 | register uint8_t p1v, p2v; | ||
189 | uint8_t dest1u; | ||
190 | uint8_t dest1v; | ||
191 | int width; | ||
192 | uint8_t *u_buffer; | ||
193 | uint8_t *v_buffer; | ||
194 | uint16_t *r, *g, *b; | ||
195 | uint8_t *py, *pu, *pv; | ||
196 | uint16_t *dst; | ||
197 | |||
198 | dxy = 0; | ||
199 | dxuv = 0; | ||
200 | width = this->dest_width; | ||
201 | u_buffer=this->u_buffer; | ||
202 | v_buffer=this->v_buffer; | ||
203 | dst = (uint16_t*)_dst; | ||
204 | py = _py; | ||
205 | pu = _pu; | ||
206 | pv = _pv; | ||
207 | |||
208 | //proceed with line scaling/conversion | ||
209 | if ((recal_uv&1)!=0) | ||
210 | { | ||
211 | recal_uv^=1; //reset bit0. | ||
212 | // init values: | ||
213 | p1u = *pu++; | ||
214 | p2u = *pu++; | ||
215 | p1v = *pv++; | ||
216 | p2v = *pv++; | ||
217 | p1y = *py++; | ||
218 | p2y = *py++; | ||
219 | |||
220 | //width loop (compute all data for a line). | ||
221 | while (width>0) | ||
222 | { | ||
223 | // proceed with u and v first (ok, and y too finally :)) [scaling part]: | ||
224 | // evaluate 1u, 1v, and 2y | ||
225 | //block1_uvy | ||
226 | dest1u=p1u + ((dxuv*(p2u-p1u))>>15); | ||
227 | dest1v=p1v + ((dxuv*(p2v-p1v))>>15); | ||
228 | // as u and v are evaluated, better save them now | ||
229 | *u_buffer++ = (uint8_t)dest1u; | ||
230 | *v_buffer++ = (uint8_t)dest1v; | ||
231 | |||
232 | dest1y=p1y + ((dxy*(p2y-p1y))>>15); | ||
233 | |||
234 | dxuv += this->step_dx; | ||
235 | dxy += this->step_dx; | ||
236 | if (dxuv > 32768) | ||
237 | { | ||
238 | dxuv -= 32768; | ||
239 | p1u = p2u; | ||
240 | p2u = *pu++; //idee pour asm, cf cas then, un merge est possible!!! | ||
241 | p1v = p2v; | ||
242 | p2v = *pv++; | ||
243 | } | ||
244 | if (dxy > 32768) | ||
245 | { | ||
246 | dxy -= 32768; | ||
247 | p1y = p2y; | ||
248 | p2y = *py++; | ||
249 | } | ||
250 | //end block1_uvy | ||
251 | |||
252 | //block2_y | ||
253 | dest2y=p1y + ((dxy*(p2y-p1y))>>15); | ||
254 | |||
255 | dxy += this->step_dx; | ||
256 | if (dxy > 32768) | ||
257 | { | ||
258 | dxy -= 32768; | ||
259 | p1y = p2y; | ||
260 | p2y = *py++; // idee pour asm, cf cas then, un merge est possible!!! | ||
261 | } | ||
262 | //end block2_y | ||
263 | |||
264 | // proceed now with YUV2RGB [conversion part]: | ||
265 | // u and v are currently in dest1u and dest1v | ||
266 | // the 2 y are in dest1y and dest2y. | ||
267 | // RGB(0),DST1(0), RGB(1), DST1(1) | ||
268 | r = this->table_rV[dest1v]; | ||
269 | g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]); | ||
270 | b = this->table_bU[dest1u]; | ||
271 | |||
272 | *dst++ = r[dest1y] + g[dest1y] + b[dest1y]; | ||
273 | *dst++ = r[dest2y] + g[dest2y] + b[dest2y]; | ||
274 | |||
275 | width -=2; | ||
276 | } | ||
277 | } | ||
278 | else | ||
279 | { | ||
280 | // this case is simple, u and v are already evaluated, | ||
281 | // Note pour moi: r, g et b pourraient etre reutilises!! | ||
282 | |||
283 | // init values: | ||
284 | p1y = *py++; | ||
285 | p2y = *py++; | ||
286 | |||
287 | //width loop (compute all data for a line). | ||
288 | while (width>0) | ||
289 | { | ||
290 | // proceed with y [scaling part]: | ||
291 | // evaluate 2y | ||
292 | //block1_y | ||
293 | dest1y=p1y + ((dxy*(p2y-p1y))>>15); | ||
294 | |||
295 | dxy += this->step_dx; | ||
296 | if (dxy > 32768) | ||
297 | { | ||
298 | dxy -= 32768; | ||
299 | p1y = p2y; | ||
300 | p2y = *py++; | ||
301 | } | ||
302 | //end block1_uvy | ||
303 | |||
304 | //block2_y | ||
305 | dest2y=p1y + ((dxy*(p2y-p1y))>>15); | ||
306 | |||
307 | dxy += this->step_dx; | ||
308 | if (dxy > 32768) | ||
309 | { | ||
310 | dxy -= 32768; | ||
311 | p1y = p2y; | ||
312 | p2y = *py++; // idee pour asm, cf cas then, un merge est possible!!! | ||
313 | } | ||
314 | //end block2_y | ||
315 | |||
316 | // proceed now with YUV2RGB [conversion part]: | ||
317 | // u and v are currently in dest1u and dest1v | ||
318 | // the 2 y are in dest1y and dest2y. | ||
319 | // RGB(0),DST1(0) | ||
320 | dest1u=*u_buffer++; | ||
321 | dest1v=*v_buffer++; | ||
322 | r = this->table_rV[dest1v]; | ||
323 | g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]); | ||
324 | b = this->table_bU[dest1u]; | ||
325 | |||
326 | *dst++ = r[dest1y] + g[dest1y] + b[dest1y]; | ||
327 | *dst++ = r[dest2y] + g[dest2y] + b[dest2y]; | ||
328 | |||
329 | width -=2; | ||
330 | } | ||
331 | } | ||
332 | // end of line scaling/conversion | ||
333 | dy += this->step_dy; | ||
334 | _dst += this->rgb_stride; | ||
335 | |||
336 | while (--height > 0 && dy < 32768) | ||
337 | { | ||
338 | xine_fast_memcpy (_dst, (uint8_t*)_dst-this->rgb_stride, this->dest_width*2); // *2 because of int8 cast! | ||
339 | dy += this->step_dy; | ||
340 | _dst += this->rgb_stride; | ||
341 | } | ||
342 | |||
343 | |||
344 | if (height <= 0) | ||
345 | break; | ||
346 | |||
347 | do | ||
348 | { | ||
349 | dy -= 32768; | ||
350 | _py += this->y_stride; | ||
351 | |||
352 | recal_uv^=2; /*bit 0 for reevaluation of scanline, bit 1 for offset.*/ | ||
353 | |||
354 | if ((recal_uv&2)==0) | ||
355 | { | ||
356 | _pu += this->uv_stride; | ||
357 | _pv += this->uv_stride; | ||
358 | recal_uv|=1; // if update, then reevaluate scanline! | ||
359 | } | ||
360 | } | ||
361 | while( dy>=32768); | ||
362 | } | ||
363 | } | ||
364 | |||
365 | |||
366 | |||
367 | /* Function: */ | ||
368 | static void arm_rgb16_step_dx_32768(yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv) | ||
369 | /* This function is called when the widht of the destination picture is the | ||
370 | same as the size of the source picture. | ||
371 | */ | ||
372 | { | ||
373 | int recal_uv, height; | ||
374 | int dy; | ||
375 | |||
376 | dy = 0; | ||
377 | height=this->dest_height; | ||
378 | recal_uv=0; | ||
379 | |||
380 | while (1) | ||
381 | { | ||
382 | uint16_t *r, *g, *b; | ||
383 | uint8_t *py, *pu, *pv; | ||
384 | uint16_t *dst; | ||
385 | int width; | ||
386 | register uint8_t p1y, p1u, p1v; | ||
387 | |||
388 | width=this->dest_width; | ||
389 | dst = (uint16_t*)_dst; | ||
390 | py = _py; | ||
391 | pu = _pu; | ||
392 | pv = _pv; | ||
393 | |||
394 | while (width>0) | ||
395 | { | ||
396 | width-=2; | ||
397 | p1y=*py++; | ||
398 | p1u=*pu++; | ||
399 | p1v=*pv++; | ||
400 | |||
401 | r = this->table_rV[p1v]; | ||
402 | g = (void *) (((uint8_t *)this->table_gU[p1u]) + this->table_gV[p1v]); | ||
403 | b = this->table_bU[p1u]; | ||
404 | |||
405 | *dst++ = r[p1y] + g[p1y] + b[p1y]; | ||
406 | p1y=*py++; | ||
407 | *dst++ = r[p1y] + g[p1y] + b[p1y]; | ||
408 | } | ||
409 | |||
410 | |||
411 | |||
412 | // end of line scaling/conversion | ||
413 | dy += this->step_dy; | ||
414 | _dst += this->rgb_stride; | ||
415 | |||
416 | while (--height > 0 && dy < 32768) | ||
417 | { | ||
418 | xine_fast_memcpy (_dst, (uint8_t*)_dst-this->rgb_stride, this->dest_width*2); // *2 because of int8 cast! | ||
419 | dy += this->step_dy; | ||
420 | _dst += this->rgb_stride; | ||
421 | } | ||
422 | |||
423 | |||
424 | if (height <= 0) | ||
425 | break; | ||
426 | |||
427 | do | ||
428 | { | ||
429 | dy -= 32768; | ||
430 | _py += this->y_stride; | ||
431 | |||
432 | recal_uv^=2; /*bit 0 for reevaluation of scanline, bit 1 for offset.*/ | ||
433 | |||
434 | if ((recal_uv&2)==0) | ||
435 | { | ||
436 | _pu += this->uv_stride; | ||
437 | _pv += this->uv_stride; | ||
438 | recal_uv|=1; // if update, then reevaluate scanline! | ||
439 | } | ||
440 | } | ||
441 | while( dy>=32768); | ||
442 | } | ||
443 | } | ||
444 | |||
445 | |||
446 | |||
447 | /* Function: */ | ||
448 | static void arm_rgb16_step_dx_bet_32768_65536(yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv) | ||
449 | /* This function is called when the destination picture is between the size | ||
450 | of the source picture, and half its size. | ||
451 | */ | ||
452 | { | ||
453 | int recal_uv, height; /* Note about recal_uv: bit0 is for | ||
454 | applying scale on u and v, bit1 is for increments of u and v pointers.*/ | ||
455 | int dy; | ||
456 | |||
457 | dy = 0; | ||
458 | height = this->dest_height; | ||
459 | recal_uv=1; // 1 for evaluation of scale_line, needed the first time | ||
460 | |||
461 | while(1) | ||
462 | { | ||
463 | register int dxy; | ||
464 | register int dxuv; | ||
465 | register uint8_t p1y, p2y; | ||
466 | uint8_t dest1y, dest2y; | ||
467 | register uint8_t p1u, p2u; | ||
468 | register uint8_t p1v, p2v; | ||
469 | uint8_t dest1u; | ||
470 | uint8_t dest1v; | ||
471 | int width; | ||
472 | uint8_t *u_buffer; | ||
473 | uint8_t *v_buffer; | ||
474 | uint16_t *r, *g, *b; | ||
475 | uint8_t *py, *pu, *pv; | ||
476 | uint16_t *dst; | ||
477 | |||
478 | dxy = 0; | ||
479 | dxuv = 0; | ||
480 | width = this->dest_width; | ||
481 | u_buffer=this->u_buffer; | ||
482 | v_buffer=this->v_buffer; | ||
483 | dst = (uint16_t*)_dst; | ||
484 | py = _py; | ||
485 | pu = _pu; | ||
486 | pv = _pv; | ||
487 | |||
488 | //proceed with line scaling/conversion | ||
489 | if ((recal_uv&1)!=0) | ||
490 | { | ||
491 | recal_uv^=1; //reset bit0. | ||
492 | // init values: | ||
493 | p1u = *pu++; | ||
494 | p2u = *pu++; | ||
495 | p1v = *pv++; | ||
496 | p2v = *pv++; | ||
497 | p1y = *py++; | ||
498 | p2y = *py++; | ||
499 | |||
500 | //width loop (compute all data for a line). | ||
501 | while (width>0) | ||
502 | { | ||
503 | // proceed with u and v first (ok, and y too finally :)) [scaling part]: | ||
504 | // evaluate 1u, 1v, and 2y | ||
505 | //block1_uvy | ||
506 | dest1u=p1u + ((dxuv*(p2u-p1u))>>15); | ||
507 | dest1v=p1v + ((dxuv*(p2v-p1v))>>15); | ||
508 | // as u and v are evaluated, better save them now | ||
509 | *u_buffer++ = (uint8_t)dest1u; | ||
510 | *v_buffer++ = (uint8_t)dest1v; | ||
511 | |||
512 | dest1y=p1y + ((dxy*(p2y-p1y))>>15); | ||
513 | |||
514 | dxuv += this->step_dx; | ||
515 | dxy += this->step_dx; | ||
516 | if (dxuv > 65536) | ||
517 | { | ||
518 | dxuv -= 65536; | ||
519 | p1u = *pu++; | ||
520 | p2u = *pu++; | ||
521 | p1v = *pv++; | ||
522 | p2v = *pv++; | ||
523 | } | ||
524 | else | ||
525 | { | ||
526 | dxuv -= 32768; | ||
527 | p1u = p2u; | ||
528 | p2u = *pu++; //idee pour asm, cf cas then, un merge est possible!!! | ||
529 | p1v = p2v; | ||
530 | p2v = *pv++; | ||
531 | } | ||
532 | if (dxy > 65536) | ||
533 | { | ||
534 | dxy -= 65536; | ||
535 | p1y = *py++; | ||
536 | p2y = *py++; | ||
537 | } | ||
538 | else | ||
539 | { | ||
540 | dxy -= 32768; | ||
541 | p1y = p2y; | ||
542 | p2y = *py++; | ||
543 | } | ||
544 | //end block1_uvy | ||
545 | |||
546 | //block2_y | ||
547 | dest2y=p1y + ((dxy*(p2y-p1y))>>15); | ||
548 | |||
549 | dxy += this->step_dx; | ||
550 | if (dxy > 65536) | ||
551 | { | ||
552 | dxy -= 65536; | ||
553 | p1y = *py++; | ||
554 | p2y = *py++; | ||
555 | } | ||
556 | else | ||
557 | { | ||
558 | dxy -= 32768; | ||
559 | p1y = p2y; | ||
560 | p2y = *py++; // idee pour asm, cf cas then, un merge est possible!!! | ||
561 | } | ||
562 | //end block2_y | ||
563 | |||
564 | // proceed now with YUV2RGB [conversion part]: | ||
565 | // u and v are currently in dest1u and dest1v | ||
566 | // the 2 y are in dest1y and dest2y. | ||
567 | // RGB(0),DST1(0), RGB(1), DST1(1) | ||
568 | r = this->table_rV[dest1v]; | ||
569 | g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]); | ||
570 | b = this->table_bU[dest1u]; | ||
571 | |||
572 | *dst++ = r[dest1y] + g[dest1y] + b[dest1y]; | ||
573 | *dst++ = r[dest2y] + g[dest2y] + b[dest2y]; | ||
574 | |||
575 | width -=2; | ||
576 | } | ||
577 | } | ||
578 | else | ||
579 | { | ||
580 | // this case is simple, u and v are already evaluated, | ||
581 | // Note pour moi: r, g et b pourraient etre reutilises!! | ||
582 | |||
583 | // init values: | ||
584 | p1y = *py++; | ||
585 | p2y = *py++; | ||
586 | |||
587 | //width loop (compute all data for a line). | ||
588 | while (width>0) | ||
589 | { | ||
590 | // proceed with y [scaling part]: | ||
591 | // evaluate 2y | ||
592 | //block1_y | ||
593 | dest1y=p1y + ((dxy*(p2y-p1y))>>15); | ||
594 | |||
595 | dxy += this->step_dx; | ||
596 | if (dxy > 65536) | ||
597 | { | ||
598 | dxy -= 65536; | ||
599 | p1y = *py++; | ||
600 | p2y = *py++; | ||
601 | } | ||
602 | else | ||
603 | { | ||
604 | dxy -= 32768; | ||
605 | p1y = p2y; | ||
606 | p2y = *py++; | ||
607 | } | ||
608 | //end block1_uvy | ||
609 | |||
610 | //block2_y | ||
611 | dest2y=p1y + ((dxy*(p2y-p1y))>>15); | ||
612 | |||
613 | dxy += this->step_dx; | ||
614 | if (dxy > 65536) | ||
615 | { | ||
616 | dxy -= 65536; | ||
617 | p1y = *py++; | ||
618 | p2y = *py++; | ||
619 | } | ||
620 | else | ||
621 | { | ||
622 | dxy -= 32768; | ||
623 | p1y = p2y; | ||
624 | p2y = *py++; // idee pour asm, cf cas then, un merge est possible!!! | ||
625 | } | ||
626 | //end block2_y | ||
627 | |||
628 | // proceed now with YUV2RGB [conversion part]: | ||
629 | // u and v are currently in dest1u and dest1v | ||
630 | // the 2 y are in dest1y and dest2y. | ||
631 | // RGB(0),DST1(0) | ||
632 | dest1u=*u_buffer++; | ||
633 | dest1v=*v_buffer++; | ||
634 | r = this->table_rV[dest1v]; | ||
635 | g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]); | ||
636 | b = this->table_bU[dest1u]; | ||
637 | |||
638 | *dst++ = r[dest1y] + g[dest1y] + b[dest1y]; | ||
639 | *dst++ = r[dest2y] + g[dest2y] + b[dest2y]; | ||
640 | |||
641 | width -=2; | ||
642 | } | ||
643 | } | ||
644 | // end of line scaling/conversion | ||
645 | dy += this->step_dy; | ||
646 | _dst += this->rgb_stride; | ||
647 | |||
648 | while (--height > 0 && dy < 32768) | ||
649 | { | ||
650 | xine_fast_memcpy (_dst, (uint8_t*)_dst-this->rgb_stride, this->dest_width*2); // *2 because of int8 cast! | ||
651 | dy += this->step_dy; | ||
652 | _dst += this->rgb_stride; | ||
653 | } | ||
654 | |||
655 | |||
656 | if (height <= 0) | ||
657 | break; | ||
658 | |||
659 | do | ||
660 | { | ||
661 | dy -= 32768; | ||
662 | _py += this->y_stride; | ||
663 | |||
664 | recal_uv^=2; /*bit 0 for reevaluation of scanline, bit 1 for offset.*/ | ||
665 | |||
666 | if ((recal_uv&2)==0) | ||
667 | { | ||
668 | _pu += this->uv_stride; | ||
669 | _pv += this->uv_stride; | ||
670 | recal_uv|=1; // if update, then reevaluate scanline! | ||
671 | } | ||
672 | } | ||
673 | while( dy>=32768); | ||
674 | } | ||
675 | } | ||
676 | |||
677 | |||
678 | |||
679 | /* Function: */ | ||
680 | static void arm_rgb16_step_dx_sup_65536(yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv) | ||
681 | /* This function is called when the destination picture is smaller than half | ||
682 | the size of the source picture, and half its size. | ||
683 | */ | ||
684 | { | ||
685 | int recal_uv, height; /* Note about recal_uv: bit0 is for | ||
686 | applying scale on u and v, bit1 is for increments of u and v pointers.*/ | ||
687 | int dy; | ||
688 | |||
689 | dy = 0; | ||
690 | height = this->dest_height; | ||
691 | recal_uv=1; // 1 for evaluation of scale_line, needed the first time | ||
692 | |||
693 | while(1) | ||
694 | { | ||
695 | register int dxy; | ||
696 | register int dxuv; | ||
697 | int offdxy, offdxuv; | ||
698 | register uint8_t p1y, p2y; | ||
699 | uint8_t dest1y, dest2y; | ||
700 | register uint8_t p1u, p2u; | ||
701 | register uint8_t p1v, p2v; | ||
702 | uint8_t dest1u; | ||
703 | uint8_t dest1v; | ||
704 | int width; | ||
705 | uint8_t *u_buffer; | ||
706 | uint8_t *v_buffer; | ||
707 | uint16_t *r, *g, *b; | ||
708 | uint8_t *py, *pu, *pv; | ||
709 | uint16_t *dst; | ||
710 | |||
711 | dxy = 0; | ||
712 | dxuv = 0; | ||
713 | width = this->dest_width; | ||
714 | u_buffer=this->u_buffer; | ||
715 | v_buffer=this->v_buffer; | ||
716 | dst = (uint16_t*)_dst; | ||
717 | py = _py; | ||
718 | pu = _pu; | ||
719 | pv = _pv; | ||
720 | |||
721 | //proceed with line scaling/conversion | ||
722 | if ((recal_uv&1)!=0) | ||
723 | { | ||
724 | recal_uv^=1; //reset bit0. | ||
725 | // init values: | ||
726 | p1u = *pu++; | ||
727 | p2u = *pu++; | ||
728 | p1v = *pv++; | ||
729 | p2v = *pv++; | ||
730 | p1y = *py++; | ||
731 | p2y = *py++; | ||
732 | |||
733 | //width loop (compute all data for a line). | ||
734 | while (width>0) | ||
735 | { | ||
736 | // proceed with u and v first (ok, and y too finally :)) [scaling part]: | ||
737 | // evaluate 1u, 1v, and 2y | ||
738 | //block1_uvy | ||
739 | dest1u=p1u + ((dxuv*(p2u-p1u))>>15); | ||
740 | dest1v=p1v + ((dxuv*(p2v-p1v))>>15); | ||
741 | // as u and v are evaluated, better save them now | ||
742 | *u_buffer++ = (uint8_t)dest1u; | ||
743 | *v_buffer++ = (uint8_t)dest1v; | ||
744 | |||
745 | dest1y=p1y + ((dxy*(p2y-p1y))>>15); | ||
746 | |||
747 | dxuv += this->step_dx; | ||
748 | dxy += this->step_dx; | ||
749 | |||
750 | offdxuv=((dxuv-1)>>15); | ||
751 | dxuv-=offdxuv<<15; | ||
752 | pu+=offdxuv-2; | ||
753 | pv+=offdxuv-2; | ||
754 | p1u = *pu++; | ||
755 | p2u = *pu++; | ||
756 | p1v = *pv++; | ||
757 | p2v = *pv++; | ||
758 | offdxy=((dxy-1)>>15); | ||
759 | dxy-=offdxy<<15; | ||
760 | py+=offdxy-2; | ||
761 | p1y = *py++; | ||
762 | p2y = *py++; | ||
763 | |||
764 | //block2_y | ||
765 | dest2y=p1y + ((dxy*(p2y-p1y))>>15); | ||
766 | |||
767 | dxy += this->step_dx; | ||
768 | offdxy=((dxy-1)>>15); | ||
769 | dxy-=offdxy<<15; | ||
770 | py+=offdxy-2; | ||
771 | p1y = *py++; | ||
772 | p2y = *py++; | ||
773 | |||
774 | // proceed now with YUV2RGB [conversion part]: | ||
775 | // u and v are currently in dest1u and dest1v | ||
776 | // the 2 y are in dest1y and dest2y. | ||
777 | // RGB(0),DST1(0), RGB(1), DST1(1) | ||
778 | r = this->table_rV[dest1v]; | ||
779 | g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]); | ||
780 | b = this->table_bU[dest1u]; | ||
781 | |||
782 | *dst++ = r[dest1y] + g[dest1y] + b[dest1y]; | ||
783 | *dst++ = r[dest2y] + g[dest2y] + b[dest2y]; | ||
784 | |||
785 | width -=2; | ||
786 | } | ||
787 | } | ||
788 | else | ||
789 | { | ||
790 | // this case is simple, u and v are already evaluated, | ||
791 | // Note pour moi: r, g et b pourraient etre reutilises!! | ||
792 | |||
793 | // init values: | ||
794 | p1y = *py++; | ||
795 | p2y = *py++; | ||
796 | |||
797 | //width loop (compute all data for a line). | ||
798 | while (width>0) | ||
799 | { | ||
800 | // proceed with y [scaling part]: | ||
801 | // evaluate 2y | ||
802 | //block1_y | ||
803 | dest1y=p1y + ((dxy*(p2y-p1y))>>15); | ||
804 | |||
805 | dxy += this->step_dx; | ||
806 | offdxy=((dxy-1)>>15); | ||
807 | dxy-=offdxy<<15; | ||
808 | py+=offdxy-2; | ||
809 | p1y = *py++; | ||
810 | p2y = *py++; | ||
811 | |||
812 | //end block1_uvy | ||
813 | |||
814 | //block2_y | ||
815 | dest2y=p1y + ((dxy*(p2y-p1y))>>15); | ||
816 | |||
817 | dxy += this->step_dx; | ||
818 | offdxy=((dxy-1)>>15); | ||
819 | dxy-=offdxy<<15; | ||
820 | py+=offdxy-2; | ||
821 | p1y = *py++; | ||
822 | p2y = *py++; | ||
823 | //end block2_y | ||
824 | |||
825 | // proceed now with YUV2RGB [conversion part]: | ||
826 | // u and v are currently in dest1u and dest1v | ||
827 | // the 2 y are in dest1y and dest2y. | ||
828 | // RGB(0),DST1(0) | ||
829 | dest1u=*u_buffer++; | ||
830 | dest1v=*v_buffer++; | ||
831 | r = this->table_rV[dest1v]; | ||
832 | g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]); | ||
833 | b = this->table_bU[dest1u]; | ||
834 | |||
835 | *dst++ = r[dest1y] + g[dest1y] + b[dest1y]; | ||
836 | *dst++ = r[dest2y] + g[dest2y] + b[dest2y]; | ||
837 | |||
838 | width -=2; | ||
839 | } | ||
840 | } | ||
841 | // end of line scaling/conversion | ||
842 | dy += this->step_dy; | ||
843 | _dst += this->rgb_stride; | ||
844 | |||
845 | while (--height > 0 && dy < 32768) | ||
846 | { | ||
847 | xine_fast_memcpy (_dst, (uint8_t*)_dst-this->rgb_stride, this->dest_width*2); // *2 because of int8 cast! | ||
848 | dy += this->step_dy; | ||
849 | _dst += this->rgb_stride; | ||
850 | } | ||
851 | |||
852 | |||
853 | if (height <= 0) | ||
854 | break; | ||
855 | |||
856 | do | ||
857 | { | ||
858 | dy -= 32768; | ||
859 | _py += this->y_stride; | ||
860 | |||
861 | recal_uv^=2; /*bit 0 for reevaluation of scanline, bit 1 for offset.*/ | ||
862 | |||
863 | if ((recal_uv&2)==0) | ||
864 | { | ||
865 | _pu += this->uv_stride; | ||
866 | _pv += this->uv_stride; | ||
867 | recal_uv|=1; // if update, then reevaluate scanline! | ||
868 | } | ||
869 | } | ||
870 | while( dy>=32768); | ||
871 | } | ||
872 | } | ||
873 | |||
874 | |||
875 | #endif | ||
diff --git a/noncore/multimedia/opierec/opierec.control b/noncore/multimedia/opierec/opierec.control index 96c1b69..a1a2b7e 100644 --- a/noncore/multimedia/opierec/opierec.control +++ b/noncore/multimedia/opierec/opierec.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-rec | 1 | Package: opierec |
2 | Files: bin/opierec pics/opierec apps/Applications/opierec.desktop | 2 | Files: bin/opierec pics/opierec apps/Applications/opierec.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: multimedia/applications | 4 | Section: multimedia/applications |
5 | Maintainer: L.J. Potter <ljp@llornkcor.com> | 5 | Maintainer: L.J. Potter <ljp@llornkcor.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 1.5-2 | 7 | Depends: opie ($QPE_VERSION) |
8 | Depends: task-opie-minimal | ||
9 | Description: audio sampling recorder | 8 | Description: audio sampling recorder |
10 | A simple audio recording/playing application. | 9 | A simple audio recording/playing application. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp index 0307d99..147f63d 100644 --- a/noncore/multimedia/opierec/qtrec.cpp +++ b/noncore/multimedia/opierec/qtrec.cpp | |||
@@ -448,9 +448,9 @@ void QtRec::init() { | |||
448 | timeLabel = new QLabel( tab, "TimeLabel" ); | 448 | timeLabel = new QLabel( tab, "TimeLabel" ); |
449 | layout1->addMultiCellWidget( timeLabel, 0, 0, 0, 3); | 449 | layout1->addMultiCellWidget( timeLabel, 0, 0, 0, 3); |
450 | 450 | ||
451 | playLabel2 = new QLabel(tab, "PlayLabel2" ); | 451 | playLabel2 = new QLabel(tab, "PlayLabel2" ); |
452 | playLabel2->setText("Play"); | 452 | playLabel2->setText(tr("Play") ); |
453 | playLabel2->setFixedHeight(18); | 453 | playLabel2->setFixedHeight(18); |
454 | layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4); | 454 | layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4); |
455 | 455 | ||
456 | Stop_PushButton = new QPushButton( tab, "Stop_PushButton" ); | 456 | Stop_PushButton = new QPushButton( tab, "Stop_PushButton" ); |
@@ -469,9 +469,9 @@ void QtRec::init() { | |||
469 | toEndButton->setPixmap( Resource::loadPixmap( "fastforward" ) ); | 469 | toEndButton->setPixmap( Resource::loadPixmap( "fastforward" ) ); |
470 | 470 | ||
471 | QLabel *recLabel2; | 471 | QLabel *recLabel2; |
472 | recLabel2 = new QLabel( tab, "recLabel2" ); | 472 | recLabel2 = new QLabel( tab, "recLabel2" ); |
473 | recLabel2->setText("Rec"); | 473 | recLabel2->setText(tr("Rec")); |
474 | recLabel2->setFixedHeight(18); | 474 | recLabel2->setFixedHeight(18); |
475 | layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7); | 475 | layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7); |
476 | 476 | ||
477 | Rec_PushButton = new QPushButton( tab, "Rec_PushButton" ); | 477 | Rec_PushButton = new QPushButton( tab, "Rec_PushButton" ); |
@@ -499,11 +499,11 @@ void QtRec::init() { | |||
499 | ListView1->setColumnWidth(0,140); | 499 | ListView1->setColumnWidth(0,140); |
500 | ListView1->setSorting( 1, false); | 500 | ListView1->setSorting( 1, false); |
501 | ListView1->addColumn( tr( "Time" ) ); //in seconds | 501 | ListView1->addColumn( tr( "Time" ) ); //in seconds |
502 | ListView1->setColumnWidth(1,50); | 502 | ListView1->setColumnWidth(1,50); |
503 | ListView1->addColumn( "Location"); | 503 | ListView1->addColumn( tr("Location") ); |
504 | ListView1->setColumnWidth(2,50); | 504 | ListView1->setColumnWidth(2,50); |
505 | ListView1->addColumn( "Date"); | 505 | ListView1->addColumn( tr("Date") ); |
506 | ListView1->setColumnWidth(3,63); | 506 | ListView1->setColumnWidth(3,63); |
507 | 507 | ||
508 | ListView1->setColumnWidthMode(0,QListView::Manual); | 508 | ListView1->setColumnWidthMode(0,QListView::Manual); |
509 | ListView1->setColumnAlignment(1,QListView::AlignCenter); | 509 | ListView1->setColumnAlignment(1,QListView::AlignCenter); |
@@ -593,12 +593,12 @@ void QtRec::init() { | |||
593 | bitRateComboBox->setGeometry( QRect( 5, 20, 50, 25 ) ); | 593 | bitRateComboBox->setGeometry( QRect( 5, 20, 50, 25 ) ); |
594 | 594 | ||
595 | Layout18->addWidget( bitGroup ); | 595 | Layout18->addWidget( bitGroup ); |
596 | 596 | ||
597 | compressionCheckBox = new QCheckBox ( "Wave Compression (smaller files)", tab_3 ); | 597 | compressionCheckBox = new QCheckBox ( tr("Wave Compression (smaller files)"), tab_3 ); |
598 | Layout18->addWidget( compressionCheckBox ); | 598 | Layout18->addWidget( compressionCheckBox ); |
599 | 599 | ||
600 | autoMuteCheckBox= new QCheckBox ( "auto Mute", tab_3 ); | 600 | autoMuteCheckBox= new QCheckBox ( tr("auto Mute"), tab_3 ); |
601 | Layout18->addWidget( autoMuteCheckBox ); | 601 | Layout18->addWidget( autoMuteCheckBox ); |
602 | 602 | ||
603 | Layout19->addLayout( Layout18 ); | 603 | Layout19->addLayout( Layout18 ); |
604 | 604 | ||
@@ -643,12 +643,12 @@ void QtRec::init() { | |||
643 | OutputSlider->setTickmarks(QSlider::Both); | 643 | OutputSlider->setTickmarks(QSlider::Both); |
644 | 644 | ||
645 | Layout15b->addWidget( OutputSlider ); | 645 | Layout15b->addWidget( OutputSlider ); |
646 | 646 | ||
647 | outMuteCheckBox = new QCheckBox ( "mute", tab_5 ); | 647 | outMuteCheckBox = new QCheckBox ( tr("mute"), tab_5 ); |
648 | Layout15->addWidget( outMuteCheckBox ); | 648 | Layout15->addWidget( outMuteCheckBox ); |
649 | 649 | ||
650 | inMuteCheckBox = new QCheckBox ( "mute", tab_5 ); | 650 | inMuteCheckBox = new QCheckBox ( tr("mute"), tab_5 ); |
651 | inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus ); | 651 | inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus ); |
652 | Layout15b->addWidget( inMuteCheckBox ); | 652 | Layout15b->addWidget( inMuteCheckBox ); |
653 | 653 | ||
654 | 654 | ||
@@ -690,12 +690,12 @@ void QtRec::init() { | |||
690 | // OutputSlider->setTickmarks(QSlider::Both); | 690 | // OutputSlider->setTickmarks(QSlider::Both); |
691 | 691 | ||
692 | Layout15b->addWidget( OutputSlider ); | 692 | Layout15b->addWidget( OutputSlider ); |
693 | 693 | ||
694 | outMuteCheckBox = new QCheckBox ( "mute", tab_3 ); | 694 | outMuteCheckBox = new QCheckBox ( tr("mute"), tab_3 ); |
695 | Layout15->addWidget( outMuteCheckBox ); | 695 | Layout15->addWidget( outMuteCheckBox ); |
696 | 696 | ||
697 | inMuteCheckBox = new QCheckBox ( "mute", tab_3 ); | 697 | inMuteCheckBox = new QCheckBox ( tr("mute"), tab_3 ); |
698 | inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus ); | 698 | inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus ); |
699 | Layout15b->addWidget( inMuteCheckBox ); | 699 | Layout15b->addWidget( inMuteCheckBox ); |
700 | 700 | ||
701 | 701 | ||
@@ -874,13 +874,13 @@ void QtRec::stop() { | |||
874 | 874 | ||
875 | void QtRec::doPlayBtn() { | 875 | void QtRec::doPlayBtn() { |
876 | 876 | ||
877 | if(!stopped) { | 877 | if(!stopped) { |
878 | playLabel2->setText("Play"); | 878 | playLabel2->setText(tr("Play")); |
879 | stop(); | 879 | stop(); |
880 | } else { | 880 | } else { |
881 | if(ListView1->currentItem() == 0) return; | 881 | if(ListView1->currentItem() == 0) return; |
882 | playLabel2->setText("Stop"); | 882 | playLabel2->setText(tr("Stop")); |
883 | currentFile = ListView1->currentItem()->text(0); | 883 | currentFile = ListView1->currentItem()->text(0); |
884 | start(); | 884 | start(); |
885 | } | 885 | } |
886 | } | 886 | } |
@@ -909,9 +909,9 @@ bool QtRec::rec() { //record | |||
909 | return false; | 909 | return false; |
910 | } else { | 910 | } else { |
911 | qDebug("go ahead and record"); | 911 | qDebug("go ahead and record"); |
912 | secCount=1; | 912 | secCount=1; |
913 | playLabel2->setText("Stop"); | 913 | playLabel2->setText(tr("Stop")); |
914 | monitoring=false; | 914 | monitoring=false; |
915 | setRecordButton(true); | 915 | setRecordButton(true); |
916 | stopped=false; | 916 | stopped=false; |
917 | 917 | ||
@@ -2158,17 +2158,17 @@ void QtRec::setRecordButton(bool b) { | |||
2158 | QPixmap image3( ( const char** ) image3_data ); | 2158 | QPixmap image3( ( const char** ) image3_data ); |
2159 | Stop_PushButton->setPixmap( image3 ); | 2159 | Stop_PushButton->setPixmap( image3 ); |
2160 | if(Stop_PushButton->isDown()) | 2160 | if(Stop_PushButton->isDown()) |
2161 | Stop_PushButton->setDown(true); | 2161 | Stop_PushButton->setDown(true); |
2162 | playLabel2->setText("Stop"); | 2162 | playLabel2->setText(tr("Stop") ); |
2163 | 2163 | ||
2164 | } else { //about to stop | 2164 | } else { //about to stop |
2165 | 2165 | ||
2166 | QPixmap image4( ( const char** ) image4_data ); | 2166 | QPixmap image4( ( const char** ) image4_data ); |
2167 | Stop_PushButton->setPixmap( image4); | 2167 | Stop_PushButton->setPixmap( image4); |
2168 | if(Stop_PushButton->isDown()) | 2168 | if(Stop_PushButton->isDown()) |
2169 | Stop_PushButton->setDown(false); | 2169 | Stop_PushButton->setDown(false); |
2170 | playLabel2->setText("Play"); | 2170 | playLabel2->setText(tr("Play") ); |
2171 | if(Rec_PushButton->isDown()) | 2171 | if(Rec_PushButton->isDown()) |
2172 | Rec_PushButton->setDown( false); | 2172 | Rec_PushButton->setDown( false); |
2173 | } | 2173 | } |
2174 | } | 2174 | } |
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control index 9dacd94..c543335 100644 --- a/noncore/multimedia/showimg/opie-showimg.control +++ b/noncore/multimedia/showimg/opie-showimg.control | |||
@@ -3,9 +3,9 @@ Files: bin/showimg apps/Applications/showimg.desktop pics/imageviewer | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Warwick Allison <warwick@trolltech.com> | 5 | Maintainer: Warwick Allison <warwick@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Image Viewer | 8 | Description: Image Viewer |
10 | The image viewer for the Opie environment. Supports | 9 | The image viewer for the Opie environment. Supports |
11 | Whichever formats are compiled into Qt/Embedded (eg. PNG). | 10 | Whichever formats are compiled into Qt/Embedded (eg. PNG). |
11 | Version: $QPE_VERSION$EXTRAVERSION | ||