author | llornkcor <llornkcor> | 2002-11-10 19:01:52 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-10 19:01:52 (UTC) |
commit | 7c012ee8cd16d8befacc6f6750711443fac0fd5e (patch) (unidiff) | |
tree | daa73f288c2dc74fda7a64822649f8bd81724aee /noncore/multimedia | |
parent | 6078687cb1e389751503ae171ed1bea72846a4de (diff) | |
download | opie-7c012ee8cd16d8befacc6f6750711443fac0fd5e.zip opie-7c012ee8cd16d8befacc6f6750711443fac0fd5e.tar.gz opie-7c012ee8cd16d8befacc6f6750711443fac0fd5e.tar.bz2 |
*** empty log message ***
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 9 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 20 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 0 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 3 |
4 files changed, 9 insertions, 23 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index e21b0b1..6ccf206 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -144,16 +144,21 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
144 | slider.setFixedHeight( 20 ); | 144 | slider.setFixedHeight( 20 ); |
145 | slider.setMinValue( 0 ); | 145 | slider.setMinValue( 0 ); |
146 | slider.setMaxValue( 1 ); | 146 | slider.setMaxValue( 1 ); |
147 | slider.setFocusPolicy( QWidget::NoFocus ); | 147 | slider.setFocusPolicy( QWidget::NoFocus ); |
148 | slider.setBackgroundPixmap( *pixBg ); | 148 | slider.setBackgroundPixmap( *pixBg ); |
149 | 149 | ||
150 | // Config cofg("qpe"); | ||
151 | // cofg.setGroup("Appearance"); | ||
152 | // QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); | ||
153 | |||
150 | time.setFocusPolicy( QWidget::NoFocus ); | 154 | time.setFocusPolicy( QWidget::NoFocus ); |
151 | time.setAlignment( Qt::AlignCenter ); | 155 | time.setAlignment( Qt::AlignCenter ); |
152 | time.setFrame(FALSE); | 156 | |
153 | changeTextColor( &time ); | 157 | // time.setFrame(FALSE); |
158 | // changeTextColor( &time ); | ||
154 | 159 | ||
155 | resizeEvent( NULL ); | 160 | resizeEvent( NULL ); |
156 | 161 | ||
157 | connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); | 162 | connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); |
158 | connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); | 163 | connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); |
159 | connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); | 164 | connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index bcd941e..7cb1d79 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -40,12 +40,13 @@ | |||
40 | #include <qpixmap.h> | 40 | #include <qpixmap.h> |
41 | #include <qstring.h> | 41 | #include <qstring.h> |
42 | #include <qslider.h> | 42 | #include <qslider.h> |
43 | #include <qframe.h> | 43 | #include <qframe.h> |
44 | #include <qlineedit.h> | 44 | #include <qlineedit.h> |
45 | 45 | ||
46 | #include <opie/oticker.h> | ||
46 | 47 | ||
47 | class QPixmap; | 48 | class QPixmap; |
48 | 49 | ||
49 | namespace { | 50 | namespace { |
50 | 51 | ||
51 | enum AudioButtons { | 52 | enum AudioButtons { |
@@ -59,29 +60,12 @@ enum AudioButtons { | |||
59 | AudioPlayList, | 60 | AudioPlayList, |
60 | AudioForward, | 61 | AudioForward, |
61 | AudioBack | 62 | AudioBack |
62 | }; | 63 | }; |
63 | }; | 64 | }; |
64 | 65 | ||
65 | class Ticker : public QFrame { | ||
66 | Q_OBJECT | ||
67 | |||
68 | public: | ||
69 | Ticker( QWidget* parent=0 ); | ||
70 | ~Ticker(); | ||
71 | void setText( const QString& text ) ; | ||
72 | |||
73 | protected: | ||
74 | void timerEvent( QTimerEvent * ); | ||
75 | void drawContents( QPainter *p ); | ||
76 | private: | ||
77 | QString scrollText; | ||
78 | int pos, pixelLen; | ||
79 | }; | ||
80 | |||
81 | |||
82 | class AudioWidget : public QWidget { | 66 | class AudioWidget : public QWidget { |
83 | Q_OBJECT | 67 | Q_OBJECT |
84 | public: | 68 | public: |
85 | AudioWidget( QWidget* parent=0, const char* name=0, WFlags f=0 ); | 69 | AudioWidget( QWidget* parent=0, const char* name=0, WFlags f=0 ); |
86 | ~AudioWidget(); | 70 | ~AudioWidget(); |
87 | void setTickerText( const QString &text ) { songInfo.setText( text ); } | 71 | void setTickerText( const QString &text ) { songInfo.setText( text ); } |
@@ -135,13 +119,13 @@ private: | |||
135 | QImage *imgButtonMask; | 119 | QImage *imgButtonMask; |
136 | QBitmap *masks[10]; | 120 | QBitmap *masks[10]; |
137 | QPixmap *buttonPixUp[10]; | 121 | QPixmap *buttonPixUp[10]; |
138 | QPixmap *buttonPixDown[10]; | 122 | QPixmap *buttonPixDown[10]; |
139 | 123 | ||
140 | QPixmap *pixmaps[4]; | 124 | QPixmap *pixmaps[4]; |
141 | Ticker songInfo; | 125 | OTicker songInfo; |
142 | QSlider slider; | 126 | QSlider slider; |
143 | QLineEdit time; | 127 | QLineEdit time; |
144 | int xoff, yoff; | 128 | int xoff, yoff; |
145 | bool isStreaming : 1; | 129 | bool isStreaming : 1; |
146 | }; | 130 | }; |
147 | 131 | ||
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 707efeb..9c285a0 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c | |||
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 040ef71..8e88e9b 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -788,15 +788,12 @@ void PlayListWidget::readm3u( const QString &filename ) { | |||
788 | for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) { | 788 | for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) { |
789 | s = *it; | 789 | s = *it; |
790 | // qDebug("reading "+ s); | 790 | // qDebug("reading "+ s); |
791 | if(s.left(4)=="http") { | 791 | if(s.left(4)=="http") { |
792 | lnk.setName( s ); //sets file name | 792 | lnk.setName( s ); //sets file name |
793 | lnk.setIcon("opieplayer2/musicfile"); | 793 | lnk.setIcon("opieplayer2/musicfile"); |
794 | // if(s.right(4) != '.' || s.right(5) != '.') | ||
795 | // lnk.setFile( s+"/"); //if url with no extension | ||
796 | // else | ||
797 | lnk.setFile( s ); //sets file name | 794 | lnk.setFile( s ); //sets file name |
798 | 795 | ||
799 | } else { | 796 | } else { |
800 | // if( QFileInfo( s ).exists() ) { | 797 | // if( QFileInfo( s ).exists() ) { |
801 | lnk.setName( QFileInfo(s).baseName()); | 798 | lnk.setName( QFileInfo(s).baseName()); |
802 | // if(s.right(4) == '.') {//if regular file | 799 | // if(s.right(4) == '.') {//if regular file |