1 files changed, 31 insertions, 8 deletions

diff --git a/noncore/multimedia/opieplayer3/videowidget.cpp b/noncore/multimedia/opieplayer3/videowidget.cpp
index c5c63c7..a28d47d 100644
--- a/noncore/multimedia/opieplayer3/videowidget.cpp
+++ b/noncore/multimedia/opieplayer3/videowidget.cpp
@@ -21,2 +21,3 @@ VideoWidget::VideoWidget( QWidget * parent, const char * name, WFlags f)
     m_Videodisplay = new XineVideoWidget(this,"videodisp");

+#if 0

     m_PosSlider = new QSlider(QSlider::Horizontal,this);

@@ -27,6 +28,9 @@ VideoWidget::VideoWidget( QWidget * parent, const char * name, WFlags f)
     connect(m_PosSlider,SIGNAL(sliderReleased()),this,SLOT(sliderReleased()));

+#endif

     connect(m_Videodisplay,SIGNAL(videoResized ( const QSize & )),this,SLOT(slot_Videoresized(const QSize&)));

     connect(m_Videodisplay,SIGNAL(clicked()),this,SLOT(slotClicked()));

+#if 0

     m_pressed = false;

     m_uppos=0;

+#endif

 }

@@ -47,4 +51,5 @@ void VideoWidget::closeEvent(QCloseEvent*e)
 

-void VideoWidget::slotNewPos(int pos)

+void VideoWidget::slotNewPos(int /*pos*/)

 {

+#if 0

     if (!m_xineLib) return;

@@ -52,2 +57,3 @@ void VideoWidget::slotNewPos(int pos)
     m_xineLib->seekTo(pos);

+#endif

 }

@@ -56,3 +62,5 @@ void VideoWidget::sliderPressed()
 {

+#if 0

     m_pressed = true;

+#endif

 }

@@ -61,7 +69,10 @@ void VideoWidget::sliderReleased()
 {

+#if 0

     m_pressed = false;

+#endif

 }

 

-void VideoWidget::fullScreen(bool how)

+void VideoWidget::fullScreen(bool /* how */)

 {

+#if 0

     if (how) {

@@ -71,9 +82,11 @@ void VideoWidget::fullScreen(bool how)
     }

+#endif

 }

 

-void VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)

+int VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)

 {

     m_current = aLnk;

+    bool recon;

     if (m_xineLib != aLib) {

-        disconnect(m_xineLib);

+        if (m_xineLib) disconnect(m_xineLib);

         m_xineLib = aLib;

@@ -82,7 +95,9 @@ void VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)
     if (!m_xineLib) {

-        return;

+        return -1;

     }

     connect(m_xineLib,SIGNAL(stopped()),this,SLOT(slotStopped()));

+#if 0

     m_uppos=0;

     m_PosSlider->setValue(0);

+#endif

     m_xineLib->setWidget(m_Videodisplay);

@@ -90,6 +105,12 @@ void VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)
     m_xineLib->resize(m_Videodisplay->size());

-    m_xineLib->play(m_current.file());

-    int l = m_xineLib->length();

+    int res = m_xineLib->play(m_current.file());

+    odebug << "Xine play: " << res << oendl;

+    if (res != 1) {

+        return -2;

+    }

+    return m_xineLib->length();

+#if 0

     m_PosSlider->setRange(0,l);

     m_PosSlider->setPageStep(l/10);

+#endif

 }

@@ -116,4 +137,5 @@ void VideoWidget::slot_Videoresized(const QSize&s)
 

-void VideoWidget::updatePos(int val)

+void VideoWidget::updatePos(int /*val*/)

 {

+#if 0

     if (m_pressed) return;

@@ -121,2 +143,3 @@ void VideoWidget::updatePos(int val)
     m_PosSlider->setValue(val);

+#endif

 }