summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/config.in3
-rw-r--r--core/multimedia/opieplayer/inputDialog.cpp3
-rw-r--r--core/multimedia/opieplayer/libmad/config.in2
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.h1
-rw-r--r--core/multimedia/opieplayer/libmpeg3/config.in2
-rw-r--r--core/multimedia/opieplayer/main.cpp1
-rw-r--r--core/multimedia/opieplayer/modplug/config.in2
-rw-r--r--core/multimedia/opieplayer/modplug/load_j2b.cpp1
-rw-r--r--core/multimedia/opieplayer/modplug/tables.cpp1
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp4
-rw-r--r--core/multimedia/opieplayer/vorbis/config.in3
-rw-r--r--core/multimedia/opieplayer/vorbis/libtremorplugin.cpp1
-rw-r--r--core/multimedia/opieplayer/vorbis/tremor/config.in2
-rw-r--r--core/multimedia/opieplayer/vorbis/vorbis.pro2
-rw-r--r--core/multimedia/opieplayer/wavplugin/config.in2
15 files changed, 12 insertions, 18 deletions
diff --git a/core/multimedia/opieplayer/config.in b/core/multimedia/opieplayer/config.in
index dc1b79a..a7ac444 100644
--- a/core/multimedia/opieplayer/config.in
+++ b/core/multimedia/opieplayer/config.in
@@ -1,12 +1,13 @@
1 config OPIEPLAYER 1 config OPIEPLAYER
2 boolean "opie-mediaplayer (mediaplayer that plays mp3, mpeg, and wav)" 2 boolean "Opieplayer"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
5 5
6 source core/multimedia/opieplayer/libflash/config.in 6 source core/multimedia/opieplayer/libflash/config.in
7 source core/multimedia/opieplayer/libmad/config.in 7 source core/multimedia/opieplayer/libmad/config.in
8 source core/multimedia/opieplayer/libmpeg3/config.in 8 source core/multimedia/opieplayer/libmpeg3/config.in
9 source core/multimedia/opieplayer/modplug/config.in 9 source core/multimedia/opieplayer/modplug/config.in
10 source core/multimedia/opieplayer/wavplugin/config.in 10 source core/multimedia/opieplayer/wavplugin/config.in
11 source core/multimedia/opieplayer/vorbis/tremor/config.in 11 source core/multimedia/opieplayer/vorbis/tremor/config.in
12 source core/multimedia/opieplayer/vorbis/config.in 12 source core/multimedia/opieplayer/vorbis/config.in
13 \ No newline at end of file
diff --git a/core/multimedia/opieplayer/inputDialog.cpp b/core/multimedia/opieplayer/inputDialog.cpp
index 62240b2..38b8f53 100644
--- a/core/multimedia/opieplayer/inputDialog.cpp
+++ b/core/multimedia/opieplayer/inputDialog.cpp
@@ -1,35 +1,32 @@
1#include "inputDialog.h" 1#include "inputDialog.h"
2 2
3#include <qpe/resource.h> 3#include <qpe/resource.h>
4 4
5#include <opie/ofiledialog.h> 5#include <opie/ofiledialog.h>
6 6
7#include <qlineedit.h> 7#include <qlineedit.h>
8#include <qlayout.h>
9#include <qvariant.h>
10#include <qpushbutton.h> 8#include <qpushbutton.h>
11#include <qwhatsthis.h>
12 9
13InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) 10InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
14 : QDialog( parent, name, modal, fl ) { 11 : QDialog( parent, name, modal, fl ) {
15 if ( !name ) { 12 if ( !name ) {
16 setName( "InputDialog" ); 13 setName( "InputDialog" );
17 } 14 }
18 resize( 234, 115); 15 resize( 234, 115);
19 setMaximumSize( QSize( 240, 40)); 16 setMaximumSize( QSize( 240, 40));
20 setCaption( tr( name ) ); 17 setCaption( tr( name ) );
21 18
22 QPushButton *browserButton; 19 QPushButton *browserButton;
23 browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); 20 browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton");
24 browserButton->setGeometry( QRect( 205, 10, 22, 22)); 21 browserButton->setGeometry( QRect( 205, 10, 22, 22));
25 connect( browserButton, SIGNAL(released()),this,SLOT(browse())); 22 connect( browserButton, SIGNAL(released()),this,SLOT(browse()));
26 LineEdit1 = new QLineEdit( this, "LineEdit1" ); 23 LineEdit1 = new QLineEdit( this, "LineEdit1" );
27 LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) ); 24 LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) );
28 LineEdit1->setFocus(); 25 LineEdit1->setFocus();
29} 26}
30/* 27/*
31 * return the current text(input) 28 * return the current text(input)
32 */ 29 */
33QString InputDialog::text() const { 30QString InputDialog::text() const {
34 return LineEdit1->text(); 31 return LineEdit1->text();
35} 32}
diff --git a/core/multimedia/opieplayer/libmad/config.in b/core/multimedia/opieplayer/libmad/config.in
index 72249dc..1239166 100644
--- a/core/multimedia/opieplayer/libmad/config.in
+++ b/core/multimedia/opieplayer/libmad/config.in
@@ -1,4 +1,4 @@
1 config LIBMAD 1 config LIBMAD
2 boolean "opieplayer1-libmadplugin (plugin with shoutcast/icecast support to play MP3 files)" 2 boolean "libmadplugin"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h
index 6747712..b05ba15 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.h
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.h
@@ -11,49 +11,48 @@
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#ifndef LIBMAD_PLUGIN_H 20#ifndef LIBMAD_PLUGIN_H
21#define LIBMAD_PLUGIN_H 21#define LIBMAD_PLUGIN_H
22 22
23#include <qstring.h> 23#include <qstring.h>
24#include <qpe/mediaplayerplugininterface.h> 24#include <qpe/mediaplayerplugininterface.h>
25/* #include "../mediaplayerplugininterface.h" */ 25/* #include "../mediaplayerplugininterface.h" */
26 26
27 27
28// #define OLD_MEDIAPLAYER_API 28// #define OLD_MEDIAPLAYER_API
29 29
30 30
31class LibMadPluginData; 31class LibMadPluginData;
32 32
33 33
34class LibMadPlugin : public MediaPlayerDecoder { 34class LibMadPlugin : public MediaPlayerDecoder {
35
36public: 35public:
37 LibMadPlugin(); 36 LibMadPlugin();
38 ~LibMadPlugin(); 37 ~LibMadPlugin();
39 38
40 const char *pluginName() { return "LibMadPlugin"; } 39 const char *pluginName() { return "LibMadPlugin"; }
41 const char *pluginComment() { return "This is the libmad library that has been wrapped as a plugin"; } 40 const char *pluginComment() { return "This is the libmad library that has been wrapped as a plugin"; }
42 double pluginVersion() { return 1.0; } 41 double pluginVersion() { return 1.0; }
43 42
44 bool isFileSupported( const QString& ); 43 bool isFileSupported( const QString& );
45 bool open( const QString& ); 44 bool open( const QString& );
46 45
47 bool close(); 46 bool close();
48 bool isOpen(); 47 bool isOpen();
49 const QString &fileInfo() { return info; } 48 const QString &fileInfo() { return info; }
50 49
51 // If decoder doesn't support audio then return 0 here 50 // If decoder doesn't support audio then return 0 here
52 int audioStreams(); 51 int audioStreams();
53 int audioChannels( int stream ); 52 int audioChannels( int stream );
54 int audioFrequency( int stream ); 53 int audioFrequency( int stream );
55 int audioSamples( int stream ); 54 int audioSamples( int stream );
56 bool audioSetSample( long sample, int stream ); 55 bool audioSetSample( long sample, int stream );
57/* int audioBitsPerSample(int) {return 0;} */ 56/* int audioBitsPerSample(int) {return 0;} */
58 long audioGetSample( int stream ); 57 long audioGetSample( int stream );
59#ifdef OLD_MEDIAPLAYER_API 58#ifdef OLD_MEDIAPLAYER_API
diff --git a/core/multimedia/opieplayer/libmpeg3/config.in b/core/multimedia/opieplayer/libmpeg3/config.in
index b965a40..b634594 100644
--- a/core/multimedia/opieplayer/libmpeg3/config.in
+++ b/core/multimedia/opieplayer/libmpeg3/config.in
@@ -1,4 +1,4 @@
1 config LIBMPEG3 1 config LIBMPEG3
2 boolean "opieplayer1-libmpeg3plugin (play MPEG3 video files)" 2 boolean "libmpeg3plugin"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/main.cpp b/core/multimedia/opieplayer/main.cpp
index 18cd7a6..32dc1d5 100644
--- a/core/multimedia/opieplayer/main.cpp
+++ b/core/multimedia/opieplayer/main.cpp
@@ -1,44 +1,43 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include <qpe/qpeapplication.h>
21#include "mediaplayerstate.h" 20#include "mediaplayerstate.h"
22#include "playlistwidget.h" 21#include "playlistwidget.h"
23#include "audiowidget.h" 22#include "audiowidget.h"
24#include "videowidget.h" 23#include "videowidget.h"
25#include "loopcontrol.h" 24#include "loopcontrol.h"
26#include "mediaplayer.h" 25#include "mediaplayer.h"
27 26
28MediaPlayerState *mediaPlayerState; 27MediaPlayerState *mediaPlayerState;
29PlayListWidget *playList; 28PlayListWidget *playList;
30AudioWidget *audioUI; 29AudioWidget *audioUI;
31VideoWidget *videoUI; 30VideoWidget *videoUI;
32LoopControl *loopControl; 31LoopControl *loopControl;
33 32
34 33
35int main(int argc, char **argv) { 34int main(int argc, char **argv) {
36 QPEApplication a(argc,argv); 35 QPEApplication a(argc,argv);
37 36
38 MediaPlayerState st( 0, "mediaPlayerState" ); 37 MediaPlayerState st( 0, "mediaPlayerState" );
39 mediaPlayerState = &st; 38 mediaPlayerState = &st;
40 PlayListWidget pl( 0, "playList" ); 39 PlayListWidget pl( 0, "playList" );
41 playList = &pl; 40 playList = &pl;
42 AudioWidget aw( 0, "audioUI" ); 41 AudioWidget aw( 0, "audioUI" );
43 audioUI = &aw; 42 audioUI = &aw;
44 VideoWidget vw( 0, "videoUI" ); 43 VideoWidget vw( 0, "videoUI" );
diff --git a/core/multimedia/opieplayer/modplug/config.in b/core/multimedia/opieplayer/modplug/config.in
index 86e4725..769db1b 100644
--- a/core/multimedia/opieplayer/modplug/config.in
+++ b/core/multimedia/opieplayer/modplug/config.in
@@ -1,4 +1,4 @@
1 config MODPLUG 1 config MODPLUG
2 boolean "opieplayer1-modplugin (play MOD/XM/S3M/IT amiga tracker modules)" 2 boolean "modplugin"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/modplug/load_j2b.cpp b/core/multimedia/opieplayer/modplug/load_j2b.cpp
index 5f60bbb..4f0b85c 100644
--- a/core/multimedia/opieplayer/modplug/load_j2b.cpp
+++ b/core/multimedia/opieplayer/modplug/load_j2b.cpp
@@ -1,18 +1,17 @@
1/* 1/*
2 * This program is free software; you can redistribute it and modify it 2 * This program is free software; you can redistribute it and modify it
3 * under the terms of the GNU General Public License as published by the 3 * under the terms of the GNU General Public License as published by the
4 * Free Software Foundation; either version 2 of the license or (at your 4 * Free Software Foundation; either version 2 of the license or (at your
5 * option) any later version. 5 * option) any later version.
6 * 6 *
7 * Authors: Olivier Lapicque <olivierl@jps.net> 7 * Authors: Olivier Lapicque <olivierl@jps.net>
8*/ 8*/
9 9
10 10
11/////////////////////////////////////////////////// 11///////////////////////////////////////////////////
12// 12//
13// J2B module loader 13// J2B module loader
14// 14//
15/////////////////////////////////////////////////// 15///////////////////////////////////////////////////
16#include "stdafx.h" 16#include "stdafx.h"
17#include "sndfile.h"
18 17
diff --git a/core/multimedia/opieplayer/modplug/tables.cpp b/core/multimedia/opieplayer/modplug/tables.cpp
index e7198b2..baf4517 100644
--- a/core/multimedia/opieplayer/modplug/tables.cpp
+++ b/core/multimedia/opieplayer/modplug/tables.cpp
@@ -1,35 +1,34 @@
1/* 1/*
2 * This program is free software; you can redistribute it and modify it 2 * This program is free software; you can redistribute it and modify it
3 * under the terms of the GNU General Public License as published by the 3 * under the terms of the GNU General Public License as published by the
4 * Free Software Foundation; either version 2 of the license or (at your 4 * Free Software Foundation; either version 2 of the license or (at your
5 * option) any later version. 5 * option) any later version.
6 * 6 *
7 * Authors: Olivier Lapicque <olivierl@jps.net> 7 * Authors: Olivier Lapicque <olivierl@jps.net>
8*/ 8*/
9 9
10#include "stdafx.h" 10#include "stdafx.h"
11#include "sndfile.h"
12 11
13#ifndef FASTSOUNDLIB 12#ifndef FASTSOUNDLIB
14//#pragma data_seg(".tables") 13//#pragma data_seg(".tables")
15#endif 14#endif
16 15
17extern const BYTE ImpulseTrackerPortaVolCmd[16]; 16extern const BYTE ImpulseTrackerPortaVolCmd[16];
18const BYTE ImpulseTrackerPortaVolCmd[16] = 17const BYTE ImpulseTrackerPortaVolCmd[16] =
19{ 18{
20 0x00, 0x01, 0x04, 0x08, 0x10, 0x20, 0x40, 0x60, 19 0x00, 0x01, 0x04, 0x08, 0x10, 0x20, 0x40, 0x60,
21 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF 20 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
22}; 21};
23 22
24// Period table for Protracker octaves 0-5: 23// Period table for Protracker octaves 0-5:
25extern const WORD ProTrackerPeriodTable[6*12]; 24extern const WORD ProTrackerPeriodTable[6*12];
26const WORD ProTrackerPeriodTable[6*12] = 25const WORD ProTrackerPeriodTable[6*12] =
27{ 26{
28 1712,1616,1524,1440,1356,1280,1208,1140,1076,1016,960,907, 27 1712,1616,1524,1440,1356,1280,1208,1140,1076,1016,960,907,
29 856,808,762,720,678,640,604,570,538,508,480,453, 28 856,808,762,720,678,640,604,570,538,508,480,453,
30 428,404,381,360,339,320,302,285,269,254,240,226, 29 428,404,381,360,339,320,302,285,269,254,240,226,
31 214,202,190,180,170,160,151,143,135,127,120,113, 30 214,202,190,180,170,160,151,143,135,127,120,113,
32 107,101,95,90,85,80,75,71,67,63,60,56, 31 107,101,95,90,85,80,75,71,67,63,60,56,
33 53,50,47,45,42,40,37,35,33,31,30,28 32 53,50,47,45,42,40,37,35,33,31,30,28
34}; 33};
35 34
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index b393230..8016d8e 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -69,49 +69,49 @@
69#include <sys/ioctl.h> 69#include <sys/ioctl.h>
70#include <sys/soundcard.h> 70#include <sys/soundcard.h>
71 71
72// for setBacklight() 72// for setBacklight()
73#include <linux/fb.h> 73#include <linux/fb.h>
74#include <sys/types.h> 74#include <sys/types.h>
75#include <sys/stat.h> 75#include <sys/stat.h>
76#include <stdlib.h> 76#include <stdlib.h>
77 77
78#define BUTTONS_ON_TOOLBAR 78#define BUTTONS_ON_TOOLBAR
79#define SIDE_BUTTONS 79#define SIDE_BUTTONS
80#define CAN_SAVE_LOAD_PLAYLISTS 80#define CAN_SAVE_LOAD_PLAYLISTS
81 81
82extern AudioWidget *audioUI; 82extern AudioWidget *audioUI;
83extern VideoWidget *videoUI; 83extern VideoWidget *videoUI;
84extern MediaPlayerState *mediaPlayerState; 84extern MediaPlayerState *mediaPlayerState;
85 85
86static inline QString fullBaseName ( const QFileInfo &fi ) 86static inline QString fullBaseName ( const QFileInfo &fi )
87{ 87{
88 QString str = fi. fileName ( ); 88 QString str = fi. fileName ( );
89 return str. left ( str. findRev ( '.' )); 89 return str. left ( str. findRev ( '.' ));
90} 90}
91 91
92 92
93QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg;audio/x-mod;audio/x-ogg"; 93QString audioMimes ="audio/mpeg;audio/x-wav;application/ogg;audio/x-mod";
94// class myFileSelector { 94// class myFileSelector {
95 95
96// }; 96// };
97class PlayListWidgetPrivate { 97class PlayListWidgetPrivate {
98public: 98public:
99 QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; 99 QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
100 QFrame *playListFrame; 100 QFrame *playListFrame;
101 FileSelector *files; 101 FileSelector *files;
102 PlayListSelection *selectedFiles; 102 PlayListSelection *selectedFiles;
103 bool setDocumentUsed; 103 bool setDocumentUsed;
104 DocLnk *current; 104 DocLnk *current;
105}; 105};
106 106
107 107
108class ToolButton : public QToolButton { 108class ToolButton : public QToolButton {
109public: 109public:
110 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) 110 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
111 : QToolButton( parent, name ) { 111 : QToolButton( parent, name ) {
112 setTextLabel( name ); 112 setTextLabel( name );
113 setPixmap( Resource::loadPixmap( icon ) ); 113 setPixmap( Resource::loadPixmap( icon ) );
114 setAutoRaise( TRUE ); 114 setAutoRaise( TRUE );
115 setFocusPolicy( QWidget::NoFocus ); 115 setFocusPolicy( QWidget::NoFocus );
116 setToggleButton( t ); 116 setToggleButton( t );
117 connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); 117 connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
@@ -1351,49 +1351,49 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
1351void PlayListWidget::keyPressEvent( QKeyEvent *) 1351void PlayListWidget::keyPressEvent( QKeyEvent *)
1352{ 1352{
1353// qDebug("Key press"); 1353// qDebug("Key press");
1354// switch ( e->key() ) { 1354// switch ( e->key() ) {
1355// ////////////////////////////// Zaurus keys 1355// ////////////////////////////// Zaurus keys
1356// case Key_A: //add to playlist 1356// case Key_A: //add to playlist
1357// qDebug("Add"); 1357// qDebug("Add");
1358// addSelected(); 1358// addSelected();
1359// break; 1359// break;
1360// case Key_R: //remove from playlist 1360// case Key_R: //remove from playlist
1361// removeSelected(); 1361// removeSelected();
1362// break; 1362// break;
1363// case Key_P: //play 1363// case Key_P: //play
1364// qDebug("Play"); 1364// qDebug("Play");
1365// playSelected(); 1365// playSelected();
1366// break; 1366// break;
1367// case Key_Space: 1367// case Key_Space:
1368// qDebug("Play"); 1368// qDebug("Play");
1369// playSelected(); 1369// playSelected();
1370// break; 1370// break;
1371// } 1371// }
1372} 1372}
1373 1373
1374void PlayListWidget::doBlank() { 1374void PlayListWidget::doBlank() {
1375 // TODO: why do we blank this way, why don't we use ODevice or ScreenSaver? 1375 // qDebug("do blanking");
1376#ifdef QT_QWS_DEVFS 1376#ifdef QT_QWS_DEVFS
1377 fd=open("/dev/fb/0",O_RDWR); 1377 fd=open("/dev/fb/0",O_RDWR);
1378#else 1378#else
1379 fd=open("/dev/fb0",O_RDWR); 1379 fd=open("/dev/fb0",O_RDWR);
1380#endif 1380#endif
1381 if (fd != -1) { 1381 if (fd != -1) {
1382 ioctl(fd,FBIOBLANK,1); 1382 ioctl(fd,FBIOBLANK,1);
1383 // close(fd); 1383 // close(fd);
1384 } 1384 }
1385} 1385}
1386 1386
1387void PlayListWidget::doUnblank() { 1387void PlayListWidget::doUnblank() {
1388 // this crashes opieplayer with a segfault 1388 // this crashes opieplayer with a segfault
1389 // int fd; 1389 // int fd;
1390 // fd=open("/dev/fb0",O_RDWR); 1390 // fd=open("/dev/fb0",O_RDWR);
1391 // qDebug("do unblanking"); 1391 // qDebug("do unblanking");
1392 if (fd != -1) { 1392 if (fd != -1) {
1393 ioctl(fd,FBIOBLANK,0); 1393 ioctl(fd,FBIOBLANK,0);
1394 close(fd); 1394 close(fd);
1395 } 1395 }
1396 QCopEnvelope h("QPE/System", "setBacklight(int)"); 1396 QCopEnvelope h("QPE/System", "setBacklight(int)");
1397 h <<-3;// v[1]; // -3 Force on 1397 h <<-3;// v[1]; // -3 Force on
1398} 1398}
1399 1399
diff --git a/core/multimedia/opieplayer/vorbis/config.in b/core/multimedia/opieplayer/vorbis/config.in
index bad9922..d66ec88 100644
--- a/core/multimedia/opieplayer/vorbis/config.in
+++ b/core/multimedia/opieplayer/vorbis/config.in
@@ -1,5 +1,6 @@
1 config LIBTREMORPLUGIN 1 config LIBTREMORPLUGIN
2 boolean "opieplayer1-libtremorplugin (play OGG vorbis files)" 2 boolean "libtremorplugin"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER 4 depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER
5 comment "tremor is ogg vorbis!!"
5 \ No newline at end of file 6 \ No newline at end of file
diff --git a/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp b/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp
index c1e1a23..53c4b2b 100644
--- a/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp
+++ b/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp
@@ -18,49 +18,48 @@
18* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19****************************************************************************/ 19****************************************************************************/
20// fixed and adapted for opieplayer 2003 ljp <llornkcor@handhelds.org> 20// fixed and adapted for opieplayer 2003 ljp <llornkcor@handhelds.org>
21 21
22#include <stdio.h> 22#include <stdio.h>
23#include <stdarg.h> 23#include <stdarg.h>
24#include <stdlib.h> 24#include <stdlib.h>
25#include <sys/types.h> 25#include <sys/types.h>
26#include <sys/stat.h> 26#include <sys/stat.h>
27#include <fcntl.h> 27#include <fcntl.h>
28#include <unistd.h> 28#include <unistd.h>
29#include <string.h> 29#include <string.h>
30#include <errno.h> 30#include <errno.h>
31#include <time.h> 31#include <time.h>
32#include <locale.h> 32#include <locale.h>
33#include <math.h> 33#include <math.h>
34#include <assert.h> 34#include <assert.h>
35 35
36#include <qmap.h> 36#include <qmap.h>
37 37
38#include "libtremorplugin.h" 38#include "libtremorplugin.h"
39 39
40 40
41extern "C" { 41extern "C" {
42#include "tremor/ivorbiscodec.h"
43#include "tremor/ivorbisfile.h" 42#include "tremor/ivorbisfile.h"
44} 43}
45 44
46 45
47#define MPEG_BUFFER_SIZE 65536 46#define MPEG_BUFFER_SIZE 65536
48//#define debugMsg(a) qDebug(a) 47//#define debugMsg(a) qDebug(a)
49#define debugMsg(a) 48#define debugMsg(a)
50 49
51 50
52class LibTremorPluginData { 51class LibTremorPluginData {
53public: 52public:
54 char* filename; 53 char* filename;
55 FILE* f; 54 FILE* f;
56 OggVorbis_File vf; 55 OggVorbis_File vf;
57 vorbis_info* vi; 56 vorbis_info* vi;
58 vorbis_comment* vc; 57 vorbis_comment* vc;
59 bool bos; 58 bool bos;
60 int csection; 59 int csection;
61 QString finfo; 60 QString finfo;
62}; 61};
63 62
64 63
65LibTremorPlugin::LibTremorPlugin() { 64LibTremorPlugin::LibTremorPlugin() {
66qDebug("<<<<<<<<<<<<<TREMOR!!!!!>>>>>>>>>>>>>>>>>>"); 65qDebug("<<<<<<<<<<<<<TREMOR!!!!!>>>>>>>>>>>>>>>>>>");
diff --git a/core/multimedia/opieplayer/vorbis/tremor/config.in b/core/multimedia/opieplayer/vorbis/tremor/config.in
index 8ee753c..f803d16 100644
--- a/core/multimedia/opieplayer/vorbis/tremor/config.in
+++ b/core/multimedia/opieplayer/vorbis/tremor/config.in
@@ -1,4 +1,4 @@
1 config LIBTREMOR 1 config LIBTREMOR
2 boolean "libtremor (library needed to play OGG files)" 2 boolean "libtremor"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER 4 depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/vorbis/vorbis.pro b/core/multimedia/opieplayer/vorbis/vorbis.pro
index a15cf9c..d566003 100644
--- a/core/multimedia/opieplayer/vorbis/vorbis.pro
+++ b/core/multimedia/opieplayer/vorbis/vorbis.pro
@@ -1,11 +1,11 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3HEADERS = libtremorplugin.h libtremorinimpl.h 3HEADERS = libtremorplugin.h libtremorpluginimpl.h
4SOURCES = libtremorplugin.cpp libtremorpluginimpl.cpp 4SOURCES = libtremorplugin.cpp libtremorpluginimpl.cpp
5TARGET = tremorplugin 5TARGET = tremorplugin
6DESTDIR = $(OPIEDIR)/plugins/codecs 6DESTDIR = $(OPIEDIR)/plugins/codecs
7INCLUDEPATH += $(OPIEDIR)/include .. tremor 7INCLUDEPATH += $(OPIEDIR)/include .. tremor
8DEPENDPATH += $(OPIEDIR)/include .. tremor 8DEPENDPATH += $(OPIEDIR)/include .. tremor
9LIBS += -lqpe -lm -ltremor 9LIBS += -lqpe -lm -ltremor
10VERSION = 1.0.0 10VERSION = 1.0.0
11include ( $(OPIEDIR)/include.pro ) 11include ( $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/wavplugin/config.in b/core/multimedia/opieplayer/wavplugin/config.in
index 56bdfab..6e4c4b3 100644
--- a/core/multimedia/opieplayer/wavplugin/config.in
+++ b/core/multimedia/opieplayer/wavplugin/config.in
@@ -1,4 +1,4 @@
1 config WAVPLUGIN 1 config WAVPLUGIN
2 boolean "opieplayer1-wavplugin (play WAV files)" 2 boolean "wavplugin"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER