[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:       2005-02-09 18:31:14
Message-ID: 20050209183114.0824D1B869 () office ! kde ! org
[Download RAW message or body]

CVS commit by vriezen: 

Clear MPlayer's slave command in initProcess. Last 'quit' command is not
confirmed written, breaking commands for next movie.
Compare sizes of the ViewLayer with the MainWindow instead of View with
Viewer widget to get an approximation on how the playlist size will be on
zoom.


  M +4 -4      kmplayerapp.cpp   1.142
  M +1 -0      kmplayerprocess.cpp   1.137


--- kdeextragear-2/kmplayer/src/kmplayerapp.cpp  #1.141:1.142
@@ -315,12 +315,12 @@ KDE_NO_EXPORT void KMPlayerApp::resizePl
         } else
             source->setAspect (1.0 * w/h);
-        //m_view->viewer()->setAspect (m_view->keepSizeRatio() ? source->aspect() : 0.0);
-        QSize s1 = m_view->size ();
-        QSize s2 = m_view->viewer ()->size ();
+        if (m_view->controlPanel ()->isVisible ())
+            h += m_view->controlPanel ()->size ().height ();
+        QSize s1 = size ();
+        QSize s2 = m_view->fullScreenWidget ()->size ();
         w += s1.width () - s2.width ();
         h += s1.height () - s2.height ();
         w = int (1.0 * w * percentage/100.0);
         h = int (1.0 * h * percentage/100.0);
-        kdDebug () << "resizePlayer (" << w << "," << h << ")" << endl;
         QSize s = sizeForCentralWidgetSize (QSize (w, h));
         resize (s);

--- kdeextragear-2/kmplayer/src/kmplayerprocess.cpp  #1.136:1.137
@@ -213,4 +213,5 @@ KDE_NO_CDTOR_EXPORT MPlayerBase::~MPlaye
 KDE_NO_EXPORT void MPlayerBase::initProcess () {
     Process::initProcess ();
+    commands.clear ();
     const KURL & url (m_source->url ());
     if (!url.isEmpty ()) {


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