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 | |||
@@ -1,8 +1,8 @@ | |||
1 | Package: opie-mediaplayer2-skin-Pod | 1 | 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 | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-mediaplayer2-skin-default-landscape | 1 | Package: opie-mediaplayer2-skin-default-landscape |
2 | Files: pics/opieplayer2/skins/default_landscape | 2 | 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 | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-mediaplayer2-skin-default | 1 | Package: opie-mediaplayer2-skin-default |
2 | Files: pics/opieplayer2/skins/default | 2 | 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 | |||
@@ -1,8 +1,8 @@ | |||
1 | Package: opie-mediaplayer2-skin-techno | 1 | 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 | |||
@@ -18,46 +18,32 @@ | |||
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <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" |
52 | 38 | ||
53 | namespace | 39 | namespace |
54 | { | 40 | { |
55 | 41 | ||
56 | const int xo = -2; // movable x offset | 42 | const int xo = -2; // movable x offset |
57 | const int yo = 22; // movable y offset | 43 | const int yo = 22; // movable y offset |
58 | 44 | ||
59 | const MediaWidget::SkinButtonInfo skinInfo[] = | 45 | const MediaWidget::SkinButtonInfo skinInfo[] = |
60 | { | 46 | { |
61 | { MediaWidget::Play, "play", MediaWidget::ToggleButton }, | 47 | { MediaWidget::Play, "play", MediaWidget::ToggleButton }, |
62 | { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, | 48 | { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, |
63 | { MediaWidget::Next, "next", MediaWidget::NormalButton }, | 49 | { MediaWidget::Next, "next", MediaWidget::NormalButton }, |
@@ -177,33 +163,33 @@ void AudioWidget::loadSkin() | |||
177 | // songInfo.setFrameStyle( QFrame::NoFrame); | 163 | // songInfo.setFrameStyle( QFrame::NoFrame); |
178 | songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); | 164 | songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); |
179 | // songInfo.setForegroundColor(Qt::white); | 165 | // songInfo.setForegroundColor(Qt::white); |
180 | 166 | ||
181 | slider.setFixedHeight( 20 ); | 167 | slider.setFixedHeight( 20 ); |
182 | slider.setMinValue( 0 ); | 168 | slider.setMinValue( 0 ); |
183 | slider.setMaxValue( 1 ); | 169 | slider.setMaxValue( 1 ); |
184 | slider.setFocusPolicy( QWidget::NoFocus ); | 170 | slider.setFocusPolicy( QWidget::NoFocus ); |
185 | slider.setBackgroundPixmap( backgroundPixmap ); | 171 | slider.setBackgroundPixmap( backgroundPixmap ); |
186 | 172 | ||
187 | // Config cofg("qpe"); | 173 | // Config cofg("qpe"); |
188 | // cofg.setGroup("Appearance"); | 174 | // cofg.setGroup("Appearance"); |
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 ); |
198 | } | 184 | } |
199 | 185 | ||
200 | void AudioWidget::setSeekable( bool isSeekable ) { | 186 | void AudioWidget::setSeekable( bool isSeekable ) { |
201 | 187 | ||
202 | if ( !isSeekable ) { | 188 | if ( !isSeekable ) { |
203 | qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); | 189 | qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); |
204 | if( !slider.isHidden()) { | 190 | if( !slider.isHidden()) { |
205 | slider.hide(); | 191 | slider.hide(); |
206 | } | 192 | } |
207 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 193 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
208 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 194 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
209 | disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 195 | disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
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 | |||
@@ -21,40 +21,33 @@ | |||
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #ifndef 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" |
49 | 42 | ||
50 | class QPixmap; | 43 | class QPixmap; |
51 | 44 | ||
52 | class AudioWidget : public MediaWidget { | 45 | class AudioWidget : public MediaWidget { |
53 | Q_OBJECT | 46 | Q_OBJECT |
54 | public: | 47 | public: |
55 | AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); | 48 | AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); |
56 | ~AudioWidget(); | 49 | ~AudioWidget(); |
57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } | 50 | void setTickerText( const QString &text ) { songInfo.setText( text ); } |
58 | 51 | ||
59 | static MediaWidget::GUIInfo guiInfo(); | 52 | static MediaWidget::GUIInfo guiInfo(); |
60 | 53 | ||
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 | |||
@@ -18,39 +18,35 @@ | |||
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <stdio.h> | 34 | |
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> |
45 | 41 | ||
46 | #include <assert.h> | 42 | #include <assert.h> |
47 | 43 | ||
48 | #include "xinevideowidget.h" | 44 | #include "xinevideowidget.h" |
49 | #include "frame.h" | 45 | #include "frame.h" |
50 | #include "lib.h" | 46 | #include "lib.h" |
51 | 47 | ||
52 | 48 | ||
53 | 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, |
54 | int width, int height,int bytes ); | 50 | int width, int height,int bytes ); |
55 | 51 | ||
56 | extern "C" { | 52 | extern "C" { |
@@ -59,48 +55,58 @@ extern "C" { | |||
59 | void null_set_show_video( const xine_vo_driver_t* self, int show ); | 55 | void null_set_show_video( const xine_vo_driver_t* self, int show ); |
60 | int null_is_fullscreen( const xine_vo_driver_t* self ); | 56 | int null_is_fullscreen( const xine_vo_driver_t* self ); |
61 | void null_set_fullscreen( const xine_vo_driver_t* self, int screen ); | 57 | void null_set_fullscreen( const xine_vo_driver_t* self, int screen ); |
62 | int null_is_scaling( const xine_vo_driver_t* self ); | 58 | int null_is_scaling( const xine_vo_driver_t* self ); |
63 | void null_set_scaling( const xine_vo_driver_t* self, int scale ); | 59 | void null_set_scaling( const xine_vo_driver_t* self, int scale ); |
64 | void null_set_gui_width( const xine_vo_driver_t* self, int width ); | 60 | void null_set_gui_width( const xine_vo_driver_t* self, int width ); |
65 | void null_set_gui_height( const xine_vo_driver_t* self, int height ); | 61 | void null_set_gui_height( const xine_vo_driver_t* self, int height ); |
66 | void null_set_mode( const xine_vo_driver_t* self, int depth, int rgb ); | 62 | void null_set_mode( const xine_vo_driver_t* self, int depth, int rgb ); |
67 | void null_set_videoGamma( const xine_vo_driver_t* self , int value ); | 63 | void null_set_videoGamma( const xine_vo_driver_t* self , int value ); |
68 | void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data ); | 64 | void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data ); |
69 | 65 | ||
70 | void null_preload_decoders( xine_stream_t *stream ); | 66 | void null_preload_decoders( xine_stream_t *stream ); |
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; |
80 | m_wid = widget; | 76 | m_wid = widget; |
81 | printf("Lib"); | 77 | printf("Lib"); |
82 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; | 78 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; |
83 | // get the configuration | 79 | // get the configuration |
84 | 80 | ||
85 | // not really OO, should be an extra class, later | 81 | // not really OO, should be an extra class, later |
86 | if ( !QFile::exists(configPath) ) { | 82 | if ( !QFile::exists(configPath) ) { |
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 ) { |
95 | initialize(); | 101 | initialize(); |
96 | m_initialized = true; | 102 | m_initialized = true; |
97 | } | 103 | } |
98 | else | 104 | else |
99 | start(); | 105 | start(); |
100 | } | 106 | } |
101 | 107 | ||
102 | void Lib::run() | 108 | void Lib::run() |
103 | { | 109 | { |
104 | qDebug( "Lib::run() started" ); | 110 | qDebug( "Lib::run() started" ); |
105 | initialize(); | 111 | initialize(); |
106 | m_initialized = true; | 112 | m_initialized = true; |
@@ -126,33 +132,33 @@ void Lib::initialize() | |||
126 | //xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL); | 132 | //xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL); |
127 | 133 | ||
128 | 134 | ||
129 | // null_display_handler( m_videoOutput, xine_display_frame, this ); | 135 | // null_display_handler( m_videoOutput, xine_display_frame, this ); |
130 | 136 | ||
131 | m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); | 137 | m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); |
132 | 138 | ||
133 | if (m_wid != 0 ) { | 139 | if (m_wid != 0 ) { |
134 | printf( "!0\n" ); | 140 | printf( "!0\n" ); |
135 | setWidget( m_wid ); | 141 | setWidget( m_wid ); |
136 | } | 142 | } |
137 | 143 | ||
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 | ||
147 | Lib::~Lib() { | 153 | Lib::~Lib() { |
148 | assert( isRunning() == false ); | 154 | assert( isRunning() == false ); |
149 | assert( m_initialized ); | 155 | assert( m_initialized ); |
150 | 156 | ||
151 | // free( m_config ); | 157 | // free( m_config ); |
152 | 158 | ||
153 | xine_close( m_stream ); | 159 | xine_close( m_stream ); |
154 | 160 | ||
155 | xine_event_dispose_queue( m_queue ); | 161 | xine_event_dispose_queue( m_queue ); |
156 | 162 | ||
157 | xine_dispose( m_stream ); | 163 | xine_dispose( m_stream ); |
158 | 164 | ||
@@ -178,34 +184,42 @@ int Lib::majorVersion() { | |||
178 | } | 184 | } |
179 | 185 | ||
180 | int Lib::minorVersion() { | 186 | int Lib::minorVersion() { |
181 | int major, minor, sub; | 187 | int major, minor, sub; |
182 | xine_get_version ( &major, &minor, &sub ); | 188 | xine_get_version ( &major, &minor, &sub ); |
183 | return minor; | 189 | return minor; |
184 | } | 190 | } |
185 | 191 | ||
186 | int Lib::subVersion() { | 192 | int Lib::subVersion() { |
187 | int major, minor, sub; | 193 | int major, minor, sub; |
188 | xine_get_version ( &major, &minor, &sub ); | 194 | xine_get_version ( &major, &minor, &sub ); |
189 | return sub; | 195 | return sub; |
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); |
200 | } | 214 | } |
201 | 215 | ||
202 | void Lib::stop() { | 216 | void Lib::stop() { |
203 | assert( m_initialized ); | 217 | assert( m_initialized ); |
204 | 218 | ||
205 | qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); | 219 | qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); |
206 | xine_stop( m_stream ); | 220 | xine_stop( m_stream ); |
207 | } | 221 | } |
208 | 222 | ||
209 | void Lib::pause( bool toggle ) { | 223 | void Lib::pause( bool toggle ) { |
210 | assert( m_initialized ); | 224 | assert( m_initialized ); |
211 | 225 | ||
@@ -230,41 +244,62 @@ int Lib::status() const { | |||
230 | return xine_get_status( m_stream ); | 244 | return xine_get_status( m_stream ); |
231 | } | 245 | } |
232 | 246 | ||
233 | int Lib::currentPosition() const { | 247 | int Lib::currentPosition() const { |
234 | assert( m_initialized ); | 248 | assert( m_initialized ); |
235 | 249 | ||
236 | int pos, time, length; | 250 | int pos, time, length; |
237 | xine_get_pos_length( m_stream, &pos, &time, &length ); | 251 | xine_get_pos_length( m_stream, &pos, &time, &length ); |
238 | return pos; | 252 | return pos; |
239 | } | 253 | } |
240 | 254 | ||
241 | int Lib::currentTime() const { | 255 | 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 ); |
259 | 294 | ||
260 | return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE ); | 295 | return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE ); |
261 | } | 296 | } |
262 | 297 | ||
263 | void Lib::seekTo( int time ) { | 298 | void Lib::seekTo( int time ) { |
264 | assert( m_initialized ); | 299 | assert( m_initialized ); |
265 | 300 | ||
266 | //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_( | 301 | //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_( |
267 | // since its now milliseconds we need *1000 | 302 | // since its now milliseconds we need *1000 |
268 | xine_play( m_stream, 0, time*1000 ); | 303 | xine_play( m_stream, 0, time*1000 ); |
269 | } | 304 | } |
270 | 305 | ||
@@ -353,35 +388,33 @@ void Lib::showVideoFullScreen( bool fullScreen ) { | |||
353 | 388 | ||
354 | bool Lib::isVideoFullScreen() const { | 389 | bool Lib::isVideoFullScreen() const { |
355 | assert( m_initialized ); | 390 | assert( m_initialized ); |
356 | 391 | ||
357 | return ::null_is_fullscreen( m_videoOutput ); | 392 | return ::null_is_fullscreen( m_videoOutput ); |
358 | } | 393 | } |
359 | 394 | ||
360 | void Lib::setScaling( bool scale ) { | 395 | void Lib::setScaling( bool scale ) { |
361 | assert( m_initialized ); | 396 | assert( m_initialized ); |
362 | 397 | ||
363 | ::null_set_scaling( m_videoOutput, scale ); | 398 | ::null_set_scaling( m_videoOutput, scale ); |
364 | } | 399 | } |
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 ); |
376 | 409 | ||
377 | return ::null_is_scaling( m_videoOutput ); | 410 | return ::null_is_scaling( m_videoOutput ); |
378 | } | 411 | } |
379 | 412 | ||
380 | void Lib::xine_event_handler( void* user_data, const xine_event_t* t ) { | 413 | void Lib::xine_event_handler( void* user_data, const xine_event_t* t ) { |
381 | ( (Lib*)user_data)->handleXineEvent( t ); | 414 | ( (Lib*)user_data)->handleXineEvent( t ); |
382 | } | 415 | } |
383 | 416 | ||
384 | void Lib::xine_display_frame( void* user_data, uint8_t *frame, | 417 | void Lib::xine_display_frame( void* user_data, uint8_t *frame, |
385 | int width, int height, int bytes ) { | 418 | int width, int height, int bytes ) { |
386 | ( (Lib*)user_data)->drawFrame( frame, width, height, bytes ); | 419 | ( (Lib*)user_data)->drawFrame( frame, width, height, bytes ); |
387 | } | 420 | } |
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 | |||
@@ -21,38 +21,33 @@ | |||
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #ifndef ZECKEXINELIB_H | 34 | #ifndef ZECKEXINELIB_H |
35 | #define ZECKEXINELIB_H | 35 | #define ZECKEXINELIB_H |
36 | 36 | ||
37 | #include <qcstring.h> | ||
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; |
47 | 42 | ||
48 | namespace XINE { | 43 | namespace XINE { |
49 | 44 | ||
50 | /** | 45 | /** |
51 | * Lib wrapps the simple interface | 46 | * Lib wrapps the simple interface |
52 | * of libxine for easy every day use | 47 | * of libxine for easy every day use |
53 | * This will become a full C++ Wrapper | 48 | * This will become a full C++ Wrapper |
54 | * It supports playing, pausing, info, | 49 | * It supports playing, pausing, info, |
55 | * stooping, seeking. | 50 | * stooping, seeking. |
56 | */ | 51 | */ |
57 | class Frame; | 52 | class Frame; |
58 | class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread | 53 | class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread |
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,45 +1,36 @@ | |||
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" |
17 | #include "volumecontrol.h" | 10 | #include "volumecontrol.h" |
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 ) { |
34 | 25 | ||
35 | m_audioUI = 0; | 26 | m_audioUI = 0; |
36 | m_videoUI = 0; | 27 | m_videoUI = 0; |
37 | m_xineControl = 0; | 28 | m_xineControl = 0; |
38 | xine = new XINE::Lib( XINE::Lib::InitializeInThread ); | 29 | xine = new XINE::Lib( XINE::Lib::InitializeInThread ); |
39 | 30 | ||
40 | fd=-1;fl=-1; | 31 | fd=-1;fl=-1; |
41 | playList.setCaption( tr( "OpiePlayer: Initializating" ) ); | 32 | playList.setCaption( tr( "OpiePlayer: Initializating" ) ); |
42 | 33 | ||
43 | qApp->processEvents(); | 34 | qApp->processEvents(); |
44 | // QPEApplication::grabKeyboard(); // EVIL | 35 | // QPEApplication::grabKeyboard(); // EVIL |
45 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 36 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
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 | |||
@@ -21,35 +21,32 @@ | |||
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #ifndef 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" |
44 | 41 | ||
45 | class DocLnk; | 42 | class DocLnk; |
46 | class VolumeControl; | 43 | class VolumeControl; |
47 | class MediaPlayerState; | 44 | class MediaPlayerState; |
48 | class AudioWidget; | 45 | class AudioWidget; |
49 | class VideoWidget; | 46 | class VideoWidget; |
50 | 47 | ||
51 | namespace XINE | 48 | namespace XINE |
52 | { | 49 | { |
53 | class Lib; | 50 | class Lib; |
54 | }; | 51 | }; |
55 | 52 | ||
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 | |||
@@ -7,32 +7,34 @@ | |||
7 | This program is free software; you can redistribute it and/or | 7 | This program is free software; you can redistribute it and/or |
8 | modify it under the terms of the GNU General Public | 8 | modify it under the terms of the GNU General Public |
9 | License as published by the Free Software Foundation; either | 9 | License as published by the Free Software Foundation; either |
10 | version 2 of the License, or (at your option) any later version. | 10 | version 2 of the License, or (at your option) any later version. |
11 | 11 | ||
12 | This program is distributed in the hope that it will be useful, | 12 | This program is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
15 | General Public License for more details. | 15 | General Public License for more details. |
16 | 16 | ||
17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
18 | along with this program; see the file COPYING. If not, write to | 18 | along with this program; see the file COPYING. If not, write to |
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 | ||
27 | #include <assert.h> | 29 | #include <assert.h> |
28 | 30 | ||
29 | MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) | 31 | MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) |
30 | : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) | 32 | : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) |
31 | { | 33 | { |
32 | connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), | 34 | connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), |
33 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); | 35 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); |
34 | connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ), | 36 | connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ), |
35 | this, SLOT( setLength( long ) ) ); | 37 | this, SLOT( setLength( long ) ) ); |
36 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), | 38 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), |
37 | this, SLOT( setPlaying( bool ) ) ); | 39 | this, SLOT( setPlaying( bool ) ) ); |
38 | 40 | ||
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 | |||
@@ -61,41 +61,35 @@ void Om3u::readM3u() { | |||
61 | // qDebug("<<<<<<reading m3u "+f.name()); | 61 | // qDebug("<<<<<<reading m3u "+f.name()); |
62 | QTextStream t(&f); | 62 | QTextStream t(&f); |
63 | QString s; | 63 | QString s; |
64 | while ( !t.atEnd() ) { | 64 | while ( !t.atEnd() ) { |
65 | s=t.readLine(); | 65 | s=t.readLine(); |
66 | // qDebug(s); | 66 | // qDebug(s); |
67 | if( s.find( "#", 0, TRUE) == -1 ) { | 67 | if( s.find( "#", 0, TRUE) == -1 ) { |
68 | if( s.left(2) == "E:" || s.left(2) == "P:" ) { | 68 | if( s.left(2) == "E:" || s.left(2) == "P:" ) { |
69 | s = s.right( s.length() -2 ); | 69 | s = s.right( s.length() -2 ); |
70 | QFileInfo f( s ); | 70 | QFileInfo f( s ); |
71 | QString name = f.baseName(); | 71 | QString name = f.baseName(); |
72 | name = name.right( name.length() - name.findRev( "\\", -1, TRUE ) -1 ); | 72 | name = name.right( name.length() - name.findRev( "\\", -1, TRUE ) -1 ); |
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 | } |
90 | 84 | ||
91 | void Om3u::readPls() { //it's a pls file | 85 | void Om3u::readPls() { //it's a pls file |
92 | QTextStream t( &f ); | 86 | QTextStream t( &f ); |
93 | QString s; | 87 | QString s; |
94 | while ( !t.atEnd() ) { | 88 | while ( !t.atEnd() ) { |
95 | s = t.readLine(); | 89 | s = t.readLine(); |
96 | if( s.left(4) == "File" ) { | 90 | if( s.left(4) == "File" ) { |
97 | s = s.right( s.length() - s.find("=",0,true)-1 ); | 91 | s = s.right( s.length() - s.find("=",0,true)-1 ); |
98 | s = s.stripWhiteSpace(); | 92 | s = s.stripWhiteSpace(); |
99 | s.replace( QRegExp( "%20" )," "); | 93 | s.replace( QRegExp( "%20" )," "); |
100 | // qDebug( "adding " + s + " to playlist" ); | 94 | // qDebug( "adding " + s + " to playlist" ); |
101 | // numberofentries=2 | 95 | // numberofentries=2 |
@@ -134,33 +128,33 @@ void Om3u::write() { //writes list to m3u file | |||
134 | } | 128 | } |
135 | f.writeBlock( list, list.length() ); | 129 | f.writeBlock( list, list.length() ); |
136 | } | 130 | } |
137 | // f.close(); | 131 | // f.close(); |
138 | } | 132 | } |
139 | 133 | ||
140 | void Om3u::add(const QString &filePath) { //adds to m3u file | 134 | void Om3u::add(const QString &filePath) { //adds to m3u file |
141 | append(filePath); | 135 | append(filePath); |
142 | } | 136 | } |
143 | 137 | ||
144 | void Om3u::remove(const QString &filePath) { //removes from m3u list | 138 | void Om3u::remove(const QString &filePath) { //removes from m3u list |
145 | QString list, currentFile; | 139 | QString list, currentFile; |
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() ); |
155 | } | 149 | } |
156 | } | 150 | } |
157 | 151 | ||
158 | void Om3u::deleteFile(const QString &/*filePath*/) {//deletes m3u file | 152 | void Om3u::deleteFile(const QString &/*filePath*/) {//deletes m3u file |
159 | f.close(); | 153 | f.close(); |
160 | f.remove(); | 154 | f.remove(); |
161 | 155 | ||
162 | } | 156 | } |
163 | 157 | ||
164 | void Om3u::close() { //closes m3u file | 158 | void Om3u::close() { //closes m3u file |
165 | f.close(); | 159 | f.close(); |
166 | } | 160 | } |
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-mediaplayer2 | 1 | Package: opie-mediaplayer2 |
2 | Files: bin/opieplayer2 apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png pics/opieplayer2/down.png pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png pics/opieplayer2/up.png pics/opieplayer2/videofile.png | 2 | Files: bin/opieplayer2 apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png pics/opieplayer2/down.png pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png pics/opieplayer2/up.png pics/opieplayer2/videofile.png |
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 | |||
@@ -1,30 +1,30 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \ | 4 | HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \ |
5 | videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \ | 5 | videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \ |
6 | frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\ | 6 | frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\ |
7 | alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \ | 7 | alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \ |
8 | skin.h | 8 | skin.h |
9 | SOURCES = main.cpp \ | 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 |
19 | DEPENDPATH += $(OPIEDIR)/include | 19 | DEPENDPATH += $(OPIEDIR)/include |
20 | LIBS += -lqpe -lpthread -lopie -lxine -lstdc++ | 20 | LIBS += -lqpe -lpthread -lopie -lxine -lstdc++ |
21 | MOC_DIR = qpeobj | 21 | MOC_DIR = qpeobj |
22 | OBJECTS_DIR = qpeobj | 22 | OBJECTS_DIR = qpeobj |
23 | 23 | ||
24 | #INCLUDEPATH += $(OPIEDIR)/include | 24 | #INCLUDEPATH += $(OPIEDIR)/include |
25 | #DEPENDPATH += $(OPIEDIR)/include | 25 | #DEPENDPATH += $(OPIEDIR)/include |
26 | 26 | ||
27 | 27 | ||
28 | 28 | ||
29 | TRANSLATIONS = ../../../i18n/de/opieplayer2.ts \ | 29 | TRANSLATIONS = ../../../i18n/de/opieplayer2.ts \ |
30 | ../../../i18n/nl/opieplayer2.ts \ | 30 | ../../../i18n/nl/opieplayer2.ts \ |
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 | |||
@@ -18,57 +18,46 @@ | |||
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; General Public License for more | 22 | ..}^=.= = ; General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = General Public License along with | 26 | -_. . . )=. = General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #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" |
53 | #include "inputDialog.h" | 43 | #include "inputDialog.h" |
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 ) |
63 | { | 52 | { |
64 | 53 | ||
65 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), | 54 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), |
66 | "opieplayer2/add_to_playlist", | 55 | "opieplayer2/add_to_playlist", |
67 | this , SLOT(addSelected() ) ); | 56 | this , SLOT(addSelected() ) ); |
68 | d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), | 57 | d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), |
69 | "opieplayer2/remove_from_playlist", | 58 | "opieplayer2/remove_from_playlist", |
70 | this , SLOT(removeSelected() ) ); | 59 | this , SLOT(removeSelected() ) ); |
71 | d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer2/play", | 60 | d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer2/play", |
72 | this , SLOT( btnPlay( bool) ), TRUE ); | 61 | this , SLOT( btnPlay( bool) ), TRUE ); |
73 | d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle", | 62 | d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle", |
74 | &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE ); | 63 | &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE ); |
@@ -654,65 +643,67 @@ void PlayListWidget::openURL() { | |||
654 | 643 | ||
655 | 644 | ||
656 | delete fileDlg; | 645 | delete fileDlg; |
657 | } | 646 | } |
658 | 647 | ||
659 | 648 | ||
660 | void PlayListWidget::openFile() { | 649 | void PlayListWidget::openFile() { |
661 | 650 | ||
662 | QString filename, name; | 651 | QString filename, name; |
663 | 652 | ||
664 | Config cfg( "OpiePlayer" ); | 653 | Config cfg( "OpiePlayer" ); |
665 | cfg.setGroup("Dialog"); | 654 | cfg.setGroup("Dialog"); |
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"; |
674 | 664 | ||
675 | all += audio; | 665 | all += audio; |
676 | all += video; | 666 | all += video; |
677 | types.insert("All Media Files", all ); | 667 | types.insert("All Media Files", all ); |
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 | ||
707 | 698 | ||
708 | void PlayListWidget::readListFromFile( const QString &filename ) { | 699 | void PlayListWidget::readListFromFile( const QString &filename ) { |
709 | qDebug( "read list filename " + filename ); | 700 | qDebug( "read list filename " + filename ); |
710 | QFileInfo fi(filename); | 701 | QFileInfo fi(filename); |
711 | Om3u *m3uList; | 702 | Om3u *m3uList; |
712 | QString s, name; | 703 | QString s, name; |
713 | m3uList = new Om3u( filename, IO_ReadOnly ); | 704 | m3uList = new Om3u( filename, IO_ReadOnly ); |
714 | if(fi.extension(false).find("m3u",0,false) != -1 ) | 705 | if(fi.extension(false).find("m3u",0,false) != -1 ) |
715 | m3uList->readM3u(); | 706 | m3uList->readM3u(); |
716 | else if(fi.extension(false).find("pls",0,false) != -1 ) | 707 | else if(fi.extension(false).find("pls",0,false) != -1 ) |
717 | m3uList->readPls(); | 708 | m3uList->readPls(); |
718 | 709 | ||
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 | |||
@@ -21,44 +21,39 @@ | |||
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; General Public License for more | 22 | ..}^=.= = ; General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = General Public License along with | 26 | -_. . . )=. = General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #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; |
53 | class QAction; | 48 | class QAction; |
54 | class QLabel; | 49 | class QLabel; |
55 | 50 | ||
56 | class PlayListWidget : public PlayListWidgetGui { | 51 | class PlayListWidget : public PlayListWidgetGui { |
57 | Q_OBJECT | 52 | Q_OBJECT |
58 | public: | 53 | public: |
59 | enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists }; | 54 | enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists }; |
60 | enum { TabTypeCount = 4 }; | 55 | enum { TabTypeCount = 4 }; |
61 | 56 | ||
62 | struct Entry | 57 | struct Entry |
63 | { | 58 | { |
64 | Entry( const QString &_name, const QString &_fileName ) | 59 | Entry( const QString &_name, const QString &_fileName ) |
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 | |||
@@ -18,77 +18,65 @@ | |||
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; General Public License for more | 22 | ..}^=.= = ; General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = General Public License along with | 26 | -_. . . )=. = General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #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 ) { |
63 | 51 | ||
64 | d = new PlayListWidgetPrivate; | 52 | d = new PlayListWidgetPrivate; |
65 | d->setDocumentUsed = FALSE; | 53 | d->setDocumentUsed = FALSE; |
66 | 54 | ||
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 ); |
83 | tbDeletePlaylist->setFixedSize( 20, 20 ); | 71 | tbDeletePlaylist->setFixedSize( 20, 20 ); |
84 | 72 | ||
85 | tbDeletePlaylist->hide(); | 73 | tbDeletePlaylist->hide(); |
86 | 74 | ||
87 | pmPlayList = new QPopupMenu( this ); | 75 | pmPlayList = new QPopupMenu( this ); |
88 | menu->insertItem( tr( "File" ), pmPlayList ); | 76 | menu->insertItem( tr( "File" ), pmPlayList ); |
89 | 77 | ||
90 | pmView = new QPopupMenu( this ); | 78 | pmView = new QPopupMenu( this ); |
91 | menu->insertItem( tr( "View" ), pmView ); | 79 | menu->insertItem( tr( "View" ), pmView ); |
92 | pmView->isCheckable(); | 80 | pmView->isCheckable(); |
93 | 81 | ||
94 | skinsMenu = new QPopupMenu( this ); | 82 | skinsMenu = new QPopupMenu( this ); |
@@ -135,33 +123,33 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg | |||
135 | QHBox *hbox2 = new QHBox( vbox3 ); | 123 | QHBox *hbox2 = new QHBox( vbox3 ); |
136 | d->selectedFiles = new PlayListSelection( hbox2 ); | 124 | d->selectedFiles = new PlayListSelection( hbox2 ); |
137 | 125 | ||
138 | vbox1 = new QVBox( hbox2 ); | 126 | vbox1 = new QVBox( hbox2 ); |
139 | QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold ); | 127 | QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold ); |
140 | QVBox *stretch1 = new QVBox( vbox1 ); // add stretch | 128 | QVBox *stretch1 = new QVBox( vbox1 ); // add stretch |
141 | 129 | ||
142 | Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 ); | 130 | Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 ); |
143 | 131 | ||
144 | QWidget *aTab; | 132 | QWidget *aTab; |
145 | aTab = new QWidget( tabWidget, "aTab" ); | 133 | aTab = new QWidget( tabWidget, "aTab" ); |
146 | 134 | ||
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 ); |
156 | 144 | ||
157 | QWidget *vTab; | 145 | QWidget *vTab; |
158 | vTab = new QWidget( tabWidget, "vTab" ); | 146 | vTab = new QWidget( tabWidget, "vTab" ); |
159 | 147 | ||
160 | QGridLayout *Vlayout = new QGridLayout( vTab ); | 148 | QGridLayout *Vlayout = new QGridLayout( vTab ); |
161 | Vlayout->setSpacing( 2 ); | 149 | Vlayout->setSpacing( 2 ); |
162 | Vlayout->setMargin( 2 ); | 150 | Vlayout->setMargin( 2 ); |
163 | videoView = new PlayListFileView( "video/*", "opieplayer2/videofile", vTab, "Videoview" ); | 151 | videoView = new PlayListFileView( "video/*", "opieplayer2/videofile", vTab, "Videoview" ); |
164 | Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 ); | 152 | Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 ); |
165 | 153 | ||
166 | QPEApplication::setStylusOperation( videoView->viewport(), QPEApplication::RightOnHold ); | 154 | QPEApplication::setStylusOperation( videoView->viewport(), QPEApplication::RightOnHold ); |
167 | 155 | ||
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 | |||
@@ -22,78 +22,74 @@ | |||
22 | ..}^=.= = ; General Public License for more | 22 | ..}^=.= = ; General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = General Public License along with | 26 | -_. . . )=. = General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #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; |
51 | class PlayListSelection; | 48 | 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; |
61 | class QLabel; | 58 | class QLabel; |
62 | 59 | ||
63 | class PlayListWidgetPrivate { | 60 | class PlayListWidgetPrivate { |
64 | public: | 61 | public: |
65 | QToolButton *tbPlay, *tbFull, *tbLoop, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; | 62 | QToolButton *tbPlay, *tbFull, *tbLoop, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; |
66 | QFrame *playListFrame; | 63 | QFrame *playListFrame; |
67 | PlayListSelection *selectedFiles; | 64 | PlayListSelection *selectedFiles; |
68 | bool setDocumentUsed; | 65 | bool setDocumentUsed; |
69 | }; | 66 | }; |
70 | 67 | ||
71 | 68 | ||
72 | class ToolButton : public QToolButton { | 69 | class ToolButton : public QToolButton { |
73 | Q_OBJECT | 70 | Q_OBJECT |
74 | public: | 71 | public: |
75 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) | 72 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) |
76 | : QToolButton( parent, name ) { | 73 | : QToolButton( parent, name ) { |
77 | setTextLabel( name ); | 74 | setTextLabel( name ); |
78 | setPixmap( Resource::loadPixmap( icon ) ); | 75 | setPixmap( Resource::loadPixmap( icon ) ); |
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 { |
88 | 84 | ||
89 | public: | 85 | public: |
90 | MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot ) | 86 | MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot ) |
91 | : QAction( text, QString::null, 0, 0 ) { | 87 | : QAction( text, QString::null, 0, 0 ) { |
92 | connect( this, SIGNAL( activated() ), handler, slot ); | 88 | connect( this, SIGNAL( activated() ), handler, slot ); |
93 | addTo( parent ); | 89 | addTo( parent ); |
94 | } | 90 | } |
95 | }; | 91 | }; |
96 | 92 | ||
97 | class PlayListWidgetGui : public QMainWindow { | 93 | class PlayListWidgetGui : public QMainWindow { |
98 | Q_OBJECT | 94 | Q_OBJECT |
99 | public: | 95 | public: |
@@ -108,26 +104,26 @@ protected: | |||
108 | QPopupMenu *pmView ; | 104 | QPopupMenu *pmView ; |
109 | QPopupMenu *gammaMenu; | 105 | QPopupMenu *gammaMenu; |
110 | QSlider *gammaSlider; | 106 | QSlider *gammaSlider; |
111 | QLCDNumber *gammaLCD; | 107 | QLCDNumber *gammaLCD; |
112 | bool fromSetDocument; | 108 | bool fromSetDocument; |
113 | bool insanityBool; | 109 | bool insanityBool; |
114 | QString setDocFileRef; | 110 | QString setDocFileRef; |
115 | // retrieve the current playlist entry (media file link) | 111 | // retrieve the current playlist entry (media file link) |
116 | QPushButton *tbDeletePlaylist; | 112 | QPushButton *tbDeletePlaylist; |
117 | int selected; | 113 | int selected; |
118 | QPopupMenu *pmPlayList; | 114 | QPopupMenu *pmPlayList; |
119 | FileSelector* playLists; | 115 | FileSelector* playLists; |
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 | ||
129 | MediaPlayerState &mediaPlayerState; | 125 | MediaPlayerState &mediaPlayerState; |
130 | }; | 126 | }; |
131 | 127 | ||
132 | #endif | 128 | #endif |
133 | 129 | ||
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 | |||
@@ -18,42 +18,32 @@ | |||
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <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 | ||
48 | 38 | ||
49 | #ifdef Q_WS_QWS | 39 | #ifdef Q_WS_QWS |
50 | # define USE_DIRECT_PAINTER | 40 | # define USE_DIRECT_PAINTER |
51 | # include <qdirectpainter_qws.h> | 41 | # include <qdirectpainter_qws.h> |
52 | # include <qgfxraster_qws.h> | 42 | # include <qgfxraster_qws.h> |
53 | #endif | 43 | #endif |
54 | 44 | ||
55 | 45 | ||
56 | namespace | 46 | namespace |
57 | { | 47 | { |
58 | 48 | ||
59 | const int xo = 2; // movable x offset | 49 | const int xo = 2; // movable x offset |
@@ -61,54 +51,54 @@ const int yo = 0; // movable y offset | |||
61 | 51 | ||
62 | const MediaWidget::SkinButtonInfo skinInfo[] = | 52 | const MediaWidget::SkinButtonInfo skinInfo[] = |
63 | { | 53 | { |
64 | { MediaWidget::Play, "play", MediaWidget::ToggleButton }, | 54 | { MediaWidget::Play, "play", MediaWidget::ToggleButton }, |
65 | { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, | 55 | { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, |
66 | { MediaWidget::Next, "fwd", MediaWidget::NormalButton }, | 56 | { MediaWidget::Next, "fwd", MediaWidget::NormalButton }, |
67 | { MediaWidget::Previous, "back", MediaWidget::NormalButton }, | 57 | { MediaWidget::Previous, "back", MediaWidget::NormalButton }, |
68 | { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton }, | 58 | { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton }, |
69 | { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton }, | 59 | { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton }, |
70 | { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton } | 60 | { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton } |
71 | }; | 61 | }; |
72 | 62 | ||
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 | ||
82 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | 72 | videoFrame = new XineVideoWidget ( this, "Video frame" ); |
83 | 73 | ||
84 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); | 74 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); |
85 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); | 75 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); |
86 | 76 | ||
87 | slider = 0; | 77 | slider = 0; |
88 | 78 | ||
89 | loadSkin(); | 79 | loadSkin(); |
90 | 80 | ||
91 | setLength( mediaPlayerState.length() ); | 81 | setLength( mediaPlayerState.length() ); |
92 | setPosition( mediaPlayerState.position() ); | 82 | setPosition( mediaPlayerState.position() ); |
93 | setFullscreen( mediaPlayerState.isFullscreen() ); | 83 | setFullscreen( mediaPlayerState.isFullscreen() ); |
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() |
103 | { | 93 | { |
104 | return GUIInfo( "V" /* infix */, ::skinInfo, ::buttonCount ); | 94 | return GUIInfo( "V" /* infix */, ::skinInfo, ::buttonCount ); |
105 | } | 95 | } |
106 | 96 | ||
107 | void VideoWidget::resizeEvent( QResizeEvent *e ) { | 97 | void VideoWidget::resizeEvent( QResizeEvent *e ) { |
108 | int h = height(); | 98 | int h = height(); |
109 | int w = width(); | 99 | int w = width(); |
110 | //int Vh = 160; | 100 | //int Vh = 160; |
111 | //int Vw = 220; | 101 | //int Vw = 220; |
112 | 102 | ||
113 | slider->setFixedWidth( w - 20 ); | 103 | slider->setFixedWidth( w - 20 ); |
114 | slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); | 104 | slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); |
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 | |||
@@ -21,37 +21,33 @@ | |||
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #ifndef 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; |
46 | 42 | ||
47 | class VideoWidget : public MediaWidget { | 43 | class VideoWidget : public MediaWidget { |
48 | Q_OBJECT | 44 | Q_OBJECT |
49 | public: | 45 | public: |
50 | VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); | 46 | VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); |
51 | ~VideoWidget(); | 47 | ~VideoWidget(); |
52 | 48 | ||
53 | static MediaWidget::GUIInfo guiInfo(); | 49 | static MediaWidget::GUIInfo guiInfo(); |
54 | 50 | ||
55 | XineVideoWidget* vidWidget(); | 51 | XineVideoWidget* vidWidget(); |
56 | public slots: | 52 | public slots: |
57 | void updateSlider( long, long ); | 53 | void updateSlider( long, long ); |
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 | |||
@@ -23,48 +23,49 @@ | |||
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = General Public License along with | 26 | -_. . . )=. = General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | 34 | ||
35 | #include <qtimer.h> | 35 | #include <qtimer.h> |
36 | #include <qmessagebox.h> | 36 | #include <qmessagebox.h> |
37 | #include <qpe/qcopenvelope_qws.h> | 37 | #include <qpe/qcopenvelope_qws.h> |
38 | #include <qpe/qpeapplication.h> | 38 | #include <qpe/qpeapplication.h> |
39 | |||
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(); |
59 | 60 | ||
60 | xine->setWidget( xineWidget ); | 61 | xine->setWidget( xineWidget ); |
61 | 62 | ||
62 | init(); | 63 | init(); |
63 | } | 64 | } |
64 | 65 | ||
65 | void XineControl::init() | 66 | void XineControl::init() |
66 | { | 67 | { |
67 | connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); | 68 | connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); |
68 | connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) ); | 69 | connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) ); |
69 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); | 70 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); |
70 | connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); | 71 | connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); |
@@ -75,48 +76,48 @@ void XineControl::init() | |||
75 | 76 | ||
76 | disabledSuspendScreenSaver = FALSE; | 77 | disabledSuspendScreenSaver = FALSE; |
77 | } | 78 | } |
78 | 79 | ||
79 | XineControl::~XineControl() { | 80 | XineControl::~XineControl() { |
80 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 81 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
81 | if ( disabledSuspendScreenSaver ) { | 82 | if ( disabledSuspendScreenSaver ) { |
82 | disabledSuspendScreenSaver = FALSE; | 83 | disabledSuspendScreenSaver = FALSE; |
83 | // Re-enable the suspend mode | 84 | // Re-enable the suspend mode |
84 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; | 85 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; |
85 | } | 86 | } |
86 | #endif | 87 | #endif |
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 | ||
95 | qDebug("<<FILENAME: " + fileName + ">>>>"); | 97 | qDebug("<<FILENAME: " + fileName + ">>>>"); |
96 | 98 | ||
97 | if ( !libXine->play( fileName, 0, 0 ) ) { | 99 | if ( !libXine->play( fileName, 0, 0 ) ) { |
98 | QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); | 100 | QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); |
99 | // toggle stop so the the play button is reset | 101 | // toggle stop so the the play button is reset |
100 | mediaPlayerState.setPlaying( false ); | 102 | mediaPlayerState.setPlaying( false ); |
101 | return; | 103 | return; |
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 ); |
111 | hasAudioChannel = TRUE; | 112 | hasAudioChannel = TRUE; |
112 | } else { | 113 | } else { |
113 | displayType = MediaPlayerState::Video; | 114 | displayType = MediaPlayerState::Video; |
114 | qDebug("HAS VIDEO"); | 115 | qDebug("HAS VIDEO"); |
115 | libXine->setShowVideo( true ); | 116 | libXine->setShowVideo( true ); |
116 | hasVideoChannel = TRUE; | 117 | hasVideoChannel = TRUE; |
117 | } | 118 | } |
118 | // determine if slider is shown | 119 | // determine if slider is shown |
119 | mediaPlayerState.setIsSeekable( libXine->isSeekable() ); | 120 | mediaPlayerState.setIsSeekable( libXine->isSeekable() ); |
120 | 121 | ||
121 | // which gui (video / audio) | 122 | // which gui (video / audio) |
122 | mediaPlayerState.setDisplayType( displayType ); | 123 | mediaPlayerState.setDisplayType( displayType ); |
@@ -184,33 +185,32 @@ void XineControl::length() { | |||
184 | } | 185 | } |
185 | 186 | ||
186 | 187 | ||
187 | /** | 188 | /** |
188 | * Reports the position the xine backend is at right now | 189 | * Reports the position the xine backend is at right now |
189 | * @return long the postion in seconds | 190 | * @return long the postion in seconds |
190 | */ | 191 | */ |
191 | long XineControl::position() { | 192 | long XineControl::position() { |
192 | m_position = ( currentTime() ); | 193 | m_position = ( currentTime() ); |
193 | mediaPlayerState.updatePosition( m_position ); | 194 | mediaPlayerState.updatePosition( m_position ); |
194 | long emitPos = (long)m_position; | 195 | long emitPos = (long)m_position; |
195 | emit positionChanged( emitPos ); | 196 | emit positionChanged( emitPos ); |
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 | /** |
205 | * Set videoplayback to fullscreen | 205 | * Set videoplayback to fullscreen |
206 | * @param isSet | 206 | * @param isSet |
207 | */ | 207 | */ |
208 | void XineControl::setFullscreen( bool isSet ) { | 208 | void XineControl::setFullscreen( bool isSet ) { |
209 | libXine->showVideoFullScreen( isSet ); | 209 | libXine->showVideoFullScreen( isSet ); |
210 | } | 210 | } |
211 | 211 | ||
212 | 212 | ||
213 | QString XineControl::getMetaInfo() { | 213 | QString XineControl::getMetaInfo() { |
214 | 214 | ||
215 | QString returnString; | 215 | QString returnString; |
216 | 216 | ||
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 | |||
@@ -22,33 +22,32 @@ | |||
22 | ..}^=.= = ; General Public License for more | 22 | ..}^=.= = ; General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = General Public License along with | 26 | -_. . . )=. = General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #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 { |
43 | Q_OBJECT | 42 | Q_OBJECT |
44 | public: | 43 | public: |
45 | XineControl( XineVideoWidget *xineWidget, | 44 | XineControl( XineVideoWidget *xineWidget, |
46 | MediaPlayerState &_mediaPlayerState, | 45 | MediaPlayerState &_mediaPlayerState, |
47 | QObject *parent = 0, const char *name =0 ); | 46 | QObject *parent = 0, const char *name =0 ); |
48 | // note that this constructor takes over ownership of the passed | 47 | // note that this constructor takes over ownership of the passed |
49 | // XINE::Lib object. | 48 | // XINE::Lib object. |
50 | XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, | 49 | XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, |
51 | MediaPlayerState &_mediaPlayerState, | 50 | MediaPlayerState &_mediaPlayerState, |
52 | QObject *parent = 0, const char *name =0 ); | 51 | QObject *parent = 0, const char *name =0 ); |
53 | ~XineControl(); | 52 | ~XineControl(); |
54 | 53 | ||
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 | |||
@@ -436,86 +436,86 @@ void QtRec::init() { | |||
436 | ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** | 436 | ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** |
437 | tab = new QWidget( TabWidget, "tab" ); | 437 | tab = new QWidget( TabWidget, "tab" ); |
438 | 438 | ||
439 | QGridLayout *layout1 = new QGridLayout( tab); | 439 | QGridLayout *layout1 = new QGridLayout( tab); |
440 | layout1->setSpacing( 2); | 440 | layout1->setSpacing( 2); |
441 | layout1->setMargin( 2); | 441 | layout1->setMargin( 2); |
442 | 442 | ||
443 | timeSlider = new QSlider( 0,100,10,0, QSlider::Horizontal, tab, (const char *) "timeSlider" ); | 443 | timeSlider = new QSlider( 0,100,10,0, QSlider::Horizontal, tab, (const char *) "timeSlider" ); |
444 | // timeSlider->setFixedWidth(150); | 444 | // timeSlider->setFixedWidth(150); |
445 | layout1->addMultiCellWidget( timeSlider, 1, 1, 0, 3); | 445 | layout1->addMultiCellWidget( timeSlider, 1, 1, 0, 3); |
446 | // timeSlider->setTickmarks(QSlider::Above); | 446 | // timeSlider->setTickmarks(QSlider::Above); |
447 | 447 | ||
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" ); |
457 | layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4); | 457 | layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4); |
458 | Stop_PushButton->setFixedSize(22,22); | 458 | Stop_PushButton->setFixedSize(22,22); |
459 | Stop_PushButton->setPixmap( image4 ); | 459 | Stop_PushButton->setPixmap( image4 ); |
460 | 460 | ||
461 | toBeginningButton = new QPushButton( tab, "Beginning_PushButton" ); | 461 | toBeginningButton = new QPushButton( tab, "Beginning_PushButton" ); |
462 | layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5); | 462 | layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5); |
463 | toBeginningButton->setFixedSize(22,22); | 463 | toBeginningButton->setFixedSize(22,22); |
464 | toBeginningButton->setPixmap( Resource::loadPixmap("fastback") ); | 464 | toBeginningButton->setPixmap( Resource::loadPixmap("fastback") ); |
465 | 465 | ||
466 | toEndButton = new QPushButton( tab, "End_PushButton" ); | 466 | toEndButton = new QPushButton( tab, "End_PushButton" ); |
467 | layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6); | 467 | layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6); |
468 | toEndButton->setFixedSize(22,22); | 468 | toEndButton->setFixedSize(22,22); |
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" ); |
478 | layout1->addMultiCellWidget( Rec_PushButton, 1, 1, 7, 7); | 478 | layout1->addMultiCellWidget( Rec_PushButton, 1, 1, 7, 7); |
479 | Rec_PushButton->setFixedSize(22,22); | 479 | Rec_PushButton->setFixedSize(22,22); |
480 | Rec_PushButton->setPixmap( image6 ); | 480 | Rec_PushButton->setPixmap( image6 ); |
481 | 481 | ||
482 | t = new QTimer( this ); | 482 | t = new QTimer( this ); |
483 | connect( t, SIGNAL( timeout() ), SLOT( timerBreak() ) ); | 483 | connect( t, SIGNAL( timeout() ), SLOT( timerBreak() ) ); |
484 | 484 | ||
485 | rewindTimer = new QTimer( this ); | 485 | rewindTimer = new QTimer( this ); |
486 | connect( rewindTimer, SIGNAL( timeout() ), SLOT( rewindTimerTimeout() ) ); | 486 | connect( rewindTimer, SIGNAL( timeout() ), SLOT( rewindTimerTimeout() ) ); |
487 | 487 | ||
488 | forwardTimer = new QTimer( this ); | 488 | forwardTimer = new QTimer( this ); |
489 | connect( forwardTimer, SIGNAL( timeout() ), SLOT( forwardTimerTimeout() ) ); | 489 | connect( forwardTimer, SIGNAL( timeout() ), SLOT( forwardTimerTimeout() ) ); |
490 | 490 | ||
491 | deleteSoundButton = new QPushButton( tab, "deleteSoundButton" ); | 491 | deleteSoundButton = new QPushButton( tab, "deleteSoundButton" ); |
492 | layout1->addMultiCellWidget( deleteSoundButton, 1, 1, 8, 8); | 492 | layout1->addMultiCellWidget( deleteSoundButton, 1, 1, 8, 8); |
493 | deleteSoundButton->setText( tr( "Delete" ) ); | 493 | deleteSoundButton->setText( tr( "Delete" ) ); |
494 | 494 | ||
495 | ListView1 = new QListView( tab, "IconView1" ); | 495 | ListView1 = new QListView( tab, "IconView1" ); |
496 | layout1->addMultiCellWidget( ListView1, 2, 2, 0, 8); | 496 | layout1->addMultiCellWidget( ListView1, 2, 2, 0, 8); |
497 | 497 | ||
498 | ListView1->addColumn( tr( "Name" ) ); | 498 | ListView1->addColumn( tr( "Name" ) ); |
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); |
510 | ListView1->setColumnAlignment(2,QListView::AlignRight); | 510 | ListView1->setColumnAlignment(2,QListView::AlignRight); |
511 | ListView1->setColumnAlignment(3,QListView::AlignLeft); | 511 | ListView1->setColumnAlignment(3,QListView::AlignLeft); |
512 | ListView1->setAllColumnsShowFocus( true ); | 512 | ListView1->setAllColumnsShowFocus( true ); |
513 | QPEApplication::setStylusOperation( ListView1->viewport(),QPEApplication::RightOnHold); | 513 | QPEApplication::setStylusOperation( ListView1->viewport(),QPEApplication::RightOnHold); |
514 | 514 | ||
515 | TabWidget->insertTab( tab, tr( "Files" ) ); | 515 | TabWidget->insertTab( tab, tr( "Files" ) ); |
516 | 516 | ||
517 | ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** | 517 | ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** |
518 | tab_3 = new QWidget( TabWidget, "tab_3" ); | 518 | tab_3 = new QWidget( TabWidget, "tab_3" ); |
519 | //////////////////////////////////// | 519 | //////////////////////////////////// |
520 | 520 | ||
521 | Layout19 = new QHBoxLayout( tab_3); | 521 | Layout19 = new QHBoxLayout( tab_3); |
@@ -581,36 +581,36 @@ void QtRec::init() { | |||
581 | directoryComboBox = new QComboBox( false, dirGroup, "dirGroup" ); | 581 | directoryComboBox = new QComboBox( false, dirGroup, "dirGroup" ); |
582 | directoryComboBox->setGeometry( QRect( 10, 15, 115, 25 ) ); | 582 | directoryComboBox->setGeometry( QRect( 10, 15, 115, 25 ) ); |
583 | 583 | ||
584 | Layout18->addWidget( dirGroup ); | 584 | Layout18->addWidget( dirGroup ); |
585 | 585 | ||
586 | bitGroup = new QGroupBox( tab_3, "bitGroup" ); | 586 | bitGroup = new QGroupBox( tab_3, "bitGroup" ); |
587 | bitGroup->setTitle( tr( "Bit Depth" ) ); | 587 | bitGroup->setTitle( tr( "Bit Depth" ) ); |
588 | bitGroup->setFixedSize(65,50); | 588 | bitGroup->setFixedSize(65,50); |
589 | 589 | ||
590 | bitRateComboBox = new QComboBox( false, bitGroup, "BitRateComboBox" ); | 590 | bitRateComboBox = new QComboBox( false, bitGroup, "BitRateComboBox" ); |
591 | bitRateComboBox->insertItem( tr( "16" ) ); | 591 | bitRateComboBox->insertItem( tr( "16" ) ); |
592 | bitRateComboBox->insertItem( tr( "8" ) ); | 592 | bitRateComboBox->insertItem( tr( "8" ) ); |
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 | ||
605 | QWidget *d = QApplication::desktop(); | 605 | QWidget *d = QApplication::desktop(); |
606 | int width=d->width(); | 606 | int width=d->width(); |
607 | int height=d->height(); | 607 | int height=d->height(); |
608 | 608 | ||
609 | 609 | ||
610 | 610 | ||
611 | if( width < height) { | 611 | if( width < height) { |
612 | 612 | ||
613 | tab_5 = new QWidget( TabWidget, "tab_5" ); | 613 | tab_5 = new QWidget( TabWidget, "tab_5" ); |
614 | 614 | ||
615 | QHBoxLayout *Layout19a; | 615 | QHBoxLayout *Layout19a; |
616 | Layout19a = new QHBoxLayout( tab_5); | 616 | Layout19a = new QHBoxLayout( tab_5); |
@@ -631,36 +631,36 @@ void QtRec::init() { | |||
631 | TextLabel2->setFixedWidth(35); | 631 | TextLabel2->setFixedWidth(35); |
632 | Layout15->addWidget( TextLabel2 ); | 632 | Layout15->addWidget( TextLabel2 ); |
633 | 633 | ||
634 | TextLabel3 = new QLabel( tab_5, "OutputLabel" ); | 634 | TextLabel3 = new QLabel( tab_5, "OutputLabel" ); |
635 | TextLabel3->setText( tr( "Out" ) ); | 635 | TextLabel3->setText( tr( "Out" ) ); |
636 | Layout15b->addWidget( TextLabel3 ); | 636 | Layout15b->addWidget( TextLabel3 ); |
637 | 637 | ||
638 | InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_5, (const char *) "InputSlider" ); | 638 | InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_5, (const char *) "InputSlider" ); |
639 | InputSlider->setTickmarks(QSlider::Both); | 639 | InputSlider->setTickmarks(QSlider::Both); |
640 | Layout15->addWidget( InputSlider); | 640 | Layout15->addWidget( InputSlider); |
641 | 641 | ||
642 | OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_5,(const char *) "OutputSlider" ); | 642 | OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_5,(const char *) "OutputSlider" ); |
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 | ||
655 | Layout19a->addLayout( Layout15 ); | 655 | Layout19a->addLayout( Layout15 ); |
656 | Layout19a->addLayout( Layout15b ); | 656 | Layout19a->addLayout( Layout15b ); |
657 | 657 | ||
658 | fillDirectoryCombo(); | 658 | fillDirectoryCombo(); |
659 | 659 | ||
660 | TabWidget->insertTab( tab_3, tr( "Options" ) ); | 660 | TabWidget->insertTab( tab_3, tr( "Options" ) ); |
661 | 661 | ||
662 | TabWidget->insertTab( tab_5, tr( "Volume" ) ); | 662 | TabWidget->insertTab( tab_5, tr( "Volume" ) ); |
663 | 663 | ||
664 | } else {// landscape | 664 | } else {// landscape |
665 | 665 | ||
666 | // Layout16->addWidget( dirGroup ); | 666 | // Layout16->addWidget( dirGroup ); |
@@ -678,36 +678,36 @@ void QtRec::init() { | |||
678 | TextLabel2->setFixedWidth(35); | 678 | TextLabel2->setFixedWidth(35); |
679 | Layout15->addWidget( TextLabel2 ); | 679 | Layout15->addWidget( TextLabel2 ); |
680 | 680 | ||
681 | TextLabel3 = new QLabel( tab_3, "OutputLabel" ); | 681 | TextLabel3 = new QLabel( tab_3, "OutputLabel" ); |
682 | TextLabel3->setText( tr( "Out" ) ); | 682 | TextLabel3->setText( tr( "Out" ) ); |
683 | Layout15b->addWidget( TextLabel3 ); | 683 | Layout15b->addWidget( TextLabel3 ); |
684 | 684 | ||
685 | InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_3, (const char *) "InputSlider" ); | 685 | InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_3, (const char *) "InputSlider" ); |
686 | // InputSlider->setTickmarks(QSlider::Both); | 686 | // InputSlider->setTickmarks(QSlider::Both); |
687 | Layout15->addWidget( InputSlider); | 687 | Layout15->addWidget( InputSlider); |
688 | 688 | ||
689 | OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_3,(const char *) "OutputSlider" ); | 689 | OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_3,(const char *) "OutputSlider" ); |
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 | ||
702 | Layout19->addLayout( Layout15 ); | 702 | Layout19->addLayout( Layout15 ); |
703 | Layout19->addLayout( Layout15b ); | 703 | Layout19->addLayout( Layout15b ); |
704 | 704 | ||
705 | fillDirectoryCombo(); | 705 | fillDirectoryCombo(); |
706 | 706 | ||
707 | TabWidget->insertTab( tab_3, tr( "Options" ) ); | 707 | TabWidget->insertTab( tab_3, tr( "Options" ) ); |
708 | 708 | ||
709 | } | 709 | } |
710 | 710 | ||
711 | 711 | ||
712 | ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** | 712 | ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** |
713 | 713 | ||
@@ -862,68 +862,68 @@ void QtRec::stop() { | |||
862 | qDebug("<<<<<<<<<stop()"); | 862 | qDebug("<<<<<<<<<stop()"); |
863 | setRecordButton(false); | 863 | setRecordButton(false); |
864 | monitoring=false; | 864 | monitoring=false; |
865 | stopped=true; | 865 | stopped=true; |
866 | 866 | ||
867 | if( !recording) | 867 | if( !recording) |
868 | endPlaying(); | 868 | endPlaying(); |
869 | else | 869 | else |
870 | endRecording(); | 870 | endRecording(); |
871 | timeSlider->setValue(0); | 871 | timeSlider->setValue(0); |
872 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << true; // mute device | 872 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << true; // mute device |
873 | } | 873 | } |
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 | } |
887 | 887 | ||
888 | void QtRec::start() { //play | 888 | void QtRec::start() { //play |
889 | if(stopped) { | 889 | if(stopped) { |
890 | qDebug("start::"); | 890 | qDebug("start::"); |
891 | QPixmap image3( ( const char** ) image3_data ); | 891 | QPixmap image3( ( const char** ) image3_data ); |
892 | Stop_PushButton->setPixmap( image3 ); | 892 | Stop_PushButton->setPixmap( image3 ); |
893 | Stop_PushButton->setDown(true); | 893 | Stop_PushButton->setDown(true); |
894 | stopped=false; | 894 | stopped=false; |
895 | paused=false; | 895 | paused=false; |
896 | secCount=1; | 896 | secCount=1; |
897 | 897 | ||
898 | if( openPlayFile()) | 898 | if( openPlayFile()) |
899 | if( setupAudio( false)) //recording is false | 899 | if( setupAudio( false)) //recording is false |
900 | doPlay(); | 900 | doPlay(); |
901 | } | 901 | } |
902 | } | 902 | } |
903 | 903 | ||
904 | bool QtRec::rec() { //record | 904 | bool QtRec::rec() { //record |
905 | qDebug("rec()"); | 905 | qDebug("rec()"); |
906 | if(!stopped) { | 906 | if(!stopped) { |
907 | qDebug("rec:: !stopped"); | 907 | qDebug("rec:: !stopped"); |
908 | monitoring=true; | 908 | monitoring=true; |
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 | ||
918 | if( setupAudio( true)) | 918 | if( setupAudio( true)) |
919 | if(setUpFile()) { | 919 | if(setUpFile()) { |
920 | qDebug("Ok to start recording"); | 920 | qDebug("Ok to start recording"); |
921 | int fileSize=0; | 921 | int fileSize=0; |
922 | Config cfg("OpieRec"); | 922 | Config cfg("OpieRec"); |
923 | cfg.setGroup("Settings"); | 923 | cfg.setGroup("Settings"); |
924 | qDebug( "<<<<<<<Device bits %d, device rate %d, device channels %d", | 924 | qDebug( "<<<<<<<Device bits %d, device rate %d, device channels %d", |
925 | soundDevice->getDeviceBits(), | 925 | soundDevice->getDeviceBits(), |
926 | soundDevice->getDeviceRate(), | 926 | soundDevice->getDeviceRate(), |
927 | soundDevice->getDeviceChannels()); | 927 | soundDevice->getDeviceChannels()); |
928 | 928 | ||
929 | //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050); | 929 | //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050); |
@@ -2146,41 +2146,41 @@ QString QtRec::getStorage(const QString &fileName) { | |||
2146 | // QString filesystemType = me->mnt_type; | 2146 | // QString filesystemType = me->mnt_type; |
2147 | 2147 | ||
2148 | // } | 2148 | // } |
2149 | // } | 2149 | // } |
2150 | // endmntent( mntfp ); | 2150 | // endmntent( mntfp ); |
2151 | } | 2151 | } |
2152 | 2152 | ||
2153 | void QtRec::setRecordButton(bool b) { | 2153 | void QtRec::setRecordButton(bool b) { |
2154 | 2154 | ||
2155 | if(b) { //about to record or play | 2155 | if(b) { //about to record or play |
2156 | 2156 | ||
2157 | Rec_PushButton->setDown(true); | 2157 | Rec_PushButton->setDown(true); |
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 | } |
2175 | 2175 | ||
2176 | void QtRec::fillDirectoryCombo() { | 2176 | void QtRec::fillDirectoryCombo() { |
2177 | if( directoryComboBox->count() > 0) | 2177 | if( directoryComboBox->count() > 0) |
2178 | directoryComboBox->clear(); | 2178 | directoryComboBox->clear(); |
2179 | int index=0; | 2179 | int index=0; |
2180 | Config cfg("OpieRec"); | 2180 | Config cfg("OpieRec"); |
2181 | cfg.setGroup("Settings"); | 2181 | cfg.setGroup("Settings"); |
2182 | QString dir= cfg.readEntry("directory", "/"); | 2182 | QString dir= cfg.readEntry("directory", "/"); |
2183 | StorageInfo storageInfo; | 2183 | StorageInfo storageInfo; |
2184 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | 2184 | const QList<FileSystem> &fs = storageInfo.fileSystems(); |
2185 | QListIterator<FileSystem> it ( fs ); | 2185 | QListIterator<FileSystem> it ( fs ); |
2186 | QString storage; | 2186 | QString storage; |
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-showimg | 1 | Package: opie-showimg |
2 | Files: bin/showimg apps/Applications/showimg.desktop pics/imageviewer | 2 | 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 | ||