[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-2/kmplayer/src
From:       Koos Vriezen <koos.vriezen () xs4all ! nl>
Date:       2003-11-30 18:17:11
[Download RAW message or body]

CVS commit by vriezen: 

Also resize player if width/height params are retrieved from 'VO: [xv] 480x208' line


  M +3 -2      kmplayerapp.cpp   1.83
  M +3 -0      kmplayerprocess.cpp   1.38
  M +5 -0      kmplayerview.cpp   1.46
  M +1 -0      kmplayerview.h   1.21


--- kdeextragear-2/kmplayer/src/kmplayerapp.cpp  #1.82:1.83
@@ -212,4 +212,6 @@ void KMPlayerApp::initView ()
     connect (m_view->broadcastButton (), SIGNAL (clicked ()),
             this, SLOT (broadcastClicked ()));
+    connect (m_view->viewer (), SIGNAL (aspectChanged ()),
+            this, SLOT (zoom100 ()));
     /*QPopupMenu * viewmenu = new QPopupMenu;
     viewmenu->insertItem (i18n ("Full Screen"), this, SLOT(fullScreen ()),
@@ -229,6 +231,4 @@ void KMPlayerApp::loadingProgress (int p
 void KMPlayerApp::playerStarted () {
     KMPlayerSource * source = m_player->process ()->source ();
-    if (source != m_tvsource && m_player->settings ()->sizeratio)
-        resizePlayer (100);
     if (source->inherits ("KMPlayerURLSource"))
         recentFiles ()->addURL (source->url ());
@@ -672,4 +672,5 @@ void KMPlayerApp::keepSizeRatio () {
     else
         m_view->viewer ()->setAspect (0.0);
+    m_player->settings ()->sizeratio = m_view->keepSizeRatio ();
     viewKeepRatio->setChecked (m_view->keepSizeRatio ());
 }

--- kdeextragear-2/kmplayer/src/kmplayerprocess.cpp  #1.37:1.38
@@ -462,4 +462,7 @@ void MPlayer::processOutput (KProcess *,
                         m_source->setWidth (movie_width);
                         m_source->setHeight (movie_height);
+                        m_source->setAspect (1.0*movie_width/movie_height);
+                        if (m_player->settings ()->sizeratio)
+                            v->viewer ()->setAspect (m_source->aspect ());
                     }
                 } else if (startRegExp.search (out) > -1) {

--- kdeextragear-2/kmplayer/src/kmplayerview.cpp  #1.45:1.46
@@ -816,8 +816,13 @@ void KMPlayerViewer::setMouseTracking (b
 
 void KMPlayerViewer::setAspect (float a) {
+    float da = m_aspect - a;
+    if (da < 0) da *= -1;
+    if (da < 0.0001)
+        return;
     m_aspect = a;
     QWidget * w = static_cast <QWidget *> (parent ());
     QResizeEvent ev (w->size (), w->size ());
     QApplication::sendEvent (w, &ev);
+    emit aspectChanged ();
 }
 

--- kdeextragear-2/kmplayer/src/kmplayerview.h  #1.20:1.21
@@ -185,4 +185,5 @@ signals:
     void aboutToPlay ();
     void clicked ();
+    void aspectChanged ();
 protected:
     void showEvent (QShowEvent *);


[prev in list] [next in list] [prev in thread] [next in thread]