1 files changed, 16 insertions, 61 deletions
diff --git a/noncore/multimedia/opieplayer3/videowidget.cpp b/noncore/multimedia/opieplayer3/videowidget.cpp
index a28d47d..833ecb4 100644
--- a/noncore/multimedia/opieplayer3/videowidget.cpp
+++ b/noncore/multimedia/opieplayer3/videowidget.cpp
@@ -15,24 +15,12 @@ VideoWidget::VideoWidget( QWidget * parent, const char * name, WFlags f)
     :QWidget(parent,name,f)
 {
     m_xineLib = 0;
-
+    m_scaleUp = false;
     m_MainLayout = new QVBoxLayout(this);
     m_MainLayout->setAutoAdd(true);
     m_Videodisplay = new XineVideoWidget(this,"videodisp");
-#if 0
-    m_PosSlider = new QSlider(QSlider::Horizontal,this);
-    m_PosSlider->setTickInterval(60);
-    connect(m_PosSlider,SIGNAL(valueChanged(int)),this,SLOT(slotNewPos(int)));
-    connect(m_PosSlider,SIGNAL(sliderMoved(int)),this,SLOT(slotNewPos(int)));
-    connect(m_PosSlider,SIGNAL(sliderPressed()),this,SLOT(sliderPressed()));
-    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
 }
 
 VideoWidget::~VideoWidget()
@@ -41,7 +29,6 @@ VideoWidget::~VideoWidget()
 
 void VideoWidget::slotClicked()
 {
-    odebug << "clicked " << oendl;
     emit videoclicked();
 }
 
@@ -49,38 +36,8 @@ void VideoWidget::closeEvent(QCloseEvent*e)
 {
 }
 
-void VideoWidget::slotNewPos(int /*pos*/)
-{
-#if 0
-    if (!m_xineLib) return;
-    if (m_uppos==pos) return;
-    m_xineLib->seekTo(pos);
-#endif
-}
-
-void VideoWidget::sliderPressed()
-{
-#if 0
-    m_pressed = true;
-#endif
-}
-
-void VideoWidget::sliderReleased()
-{
-#if 0
-    m_pressed = false;
-#endif
-}
-
 void VideoWidget::fullScreen(bool /* how */)
 {
-#if 0
-    if (how) {
-        m_PosSlider->hide();
-    } else {
-        m_PosSlider->show();
-    }
-#endif
 }
 
 int VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)
@@ -96,23 +53,16 @@ int VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)
         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);
     m_xineLib->setShowVideo(true);
-    m_xineLib->resize(m_Videodisplay->size());
     int res = m_xineLib->play(m_current.file());
+    vSize = m_xineLib->videoSize();
+    slot_Videoresized(m_Videodisplay->size());
     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
 }
 
 void VideoWidget::stopPlaying()
@@ -124,22 +74,27 @@ void VideoWidget::stopPlaying()
 
 void VideoWidget::slotStopped()
 {
-// check fullscreen here!
 }
 
 void VideoWidget::slot_Videoresized(const QSize&s)
 {
-    odebug << "Videoresized: " << s << oendl;
     if (m_xineLib) {
-        m_xineLib->resize(s);
+        if (vSize.width()<s.width()&&vSize.height()<s.height()&&!m_scaleUp) {
+            m_xineLib->resize(vSize);
+        } else {
+            m_xineLib->resize(s);
+        }
     }
 }
 
+void VideoWidget::scaleUp(bool how)
+{
+    if (how == m_scaleUp) return;
+    m_scaleUp = how;
+    slot_Videoresized(m_Videodisplay->size());
+    m_Videodisplay->repaint();
+}
+
 void VideoWidget::updatePos(int /*val*/)
 {
-#if 0
-    if (m_pressed) return;
-    m_uppos = val;
-    m_PosSlider->setValue(val);
-#endif
 }