[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-03-22 19:44:37
Message-ID: 20050322194437.655103C5 () office ! kde ! org
[Download RAW message or body]

CVS commit by vriezen: 

More undo's of r1.75 (follow up on r1.179)


  M +3 -6      kmplayerpartbase.cpp   1.181


--- kdeextragear-2/kmplayer/src/kmplayerpartbase.cpp  #1.180:1.181
@@ -412,9 +412,7 @@ bool PartBase::openFile () {
 
 void PartBase::keepMovieAspect (bool b) {
-    if (!m_view) return;
+    if (!m_view || !m_source) return;
     m_view->setKeepSizeRatio (b);
-    Mrl * mrl = m_source->current () ? m_source->current ()->mrl () : 0L;
-    if (m_view->viewer ())
-        m_view->viewer ()->setAspect (b && mrl ? mrl->aspect : 0.0);
+    m_view->viewer ()->setAspect (b ? m_source->aspect () : 0.0);
 }
 
@@ -463,7 +461,6 @@ void PartBase::processStateChange (KMPla
     Source * src = m_process->player() == this ? m_source : m_process->source();
     if (state == Process::Playing) {
-        Mrl * mrl = m_source->current () ? m_source->current ()->mrl () : 0L;
         m_process->view ()->videoStart ();
-        m_view->viewer ()->setAspect (m_settings->sizeratio && mrl ? mrl->aspect : 0.0);
+        m_view->viewer ()->setAspect (m_source->aspect ());
         m_view->controlPanel ()->showPositionSlider (!!src->length ());
         m_view->controlPanel ()->enableSeekButtons (src->isSeekable ());


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