added f9= hide/show audio widget, f10= hide/show video widget, fixed laylist stuff, and fixed slier for the last time

1 files changed, 23 insertions, 9 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index e2e3603..94b979f 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -27,2 +27,3 @@
 #include <qframe.h>
+#include <qlayout.h>
 
@@ -65,4 +66,8 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
 {
-//    QPEApplication::grabKeyboard();
     setCaption( tr("OpiePlayer") );
+
+//     QGridLayout *layout = new QGridLayout( this );
+//     layout->setSpacing( 2);
+//     layout->setMargin( 2);
+
     setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
@@ -75,4 +80,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     songInfo->setFocusPolicy( QWidget::NoFocus );
-    songInfo->setGeometry( QRect( 7, 3, 220, 20 ) );
-
+     songInfo->setGeometry( QRect( 7, 3, 220, 20 ) );
+//    layout->addMultiCellWidget( songInfo, 0, 0, 0, 2 );
+ 
     slider = new QSlider( Qt::Horizontal, this );
@@ -85,2 +91,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     slider->setGeometry( QRect( 7, 262, 220, 20 ) );
+      //  layout->addMultiCellWidget( slider, 4, 4, 0, 2 );
 
@@ -106,2 +113,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
 AudioWidget::~AudioWidget() {
+    mediaPlayerState->isStreaming = FALSE;
     for ( int i = 0; i < 4; i++ )
@@ -139,2 +147,3 @@ void AudioWidget::setLength( long max ) {
 void AudioWidget::setView( char view ) {
+
     if (mediaPlayerState->isStreaming) {
@@ -146,3 +155,3 @@ void AudioWidget::setView( char view ) {
           // does not stop stream when it reaches the end
-        if( slider->isHidden()) slider->show();
+ slider->show();
         connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
@@ -152,7 +161,8 @@ void AudioWidget::setView( char view ) {
     if ( view == 'a' ) {
-  startTimer( 150 );
-  showMaximized();
+        startTimer( 150 );
+//        show();
+        showMaximized();
     } else {
-  killTimers();
-  hide();
+        killTimers();
+        hide();
     }
@@ -292,3 +302,5 @@ void AudioWidget::paintEvent( QPaintEvent * ) {
 
-
+void AudioWidget::showMe() {
+   show();
+}
 void AudioWidget::keyReleaseEvent( QKeyEvent *e)
@@ -300,2 +312,4 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
       case Key_F9: //activity
+           hide();
+//           qDebug("Audio F9");
           break;