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

List:       kde-commits
Subject:    KDE/kdemultimedia/dragonplayer/src/app
From:       David Edmundson <kde () davidedmundson ! co ! uk>
Date:       2008-06-05 17:23:54
Message-ID: 1212686634.002023.3758.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 817289 by davidedmundson:

Fixes the regression caused by commit 808988, and fixes bug 163099

Window size defaults to video resoultion.



 M  +11 -0     videoWindow.cpp  
 M  +1 -0      videoWindow.h  


--- trunk/KDE/kdemultimedia/dragonplayer/src/app/videoWindow.cpp #817288:817289
@@ -73,6 +73,7 @@
         : QWidget( parent )
         , m_cursorTimer( new QTimer( this ) )
         , m_justLoaded( false )
+		, m_adjustedSize( false)
         , m_xineStream( 0 )
         , m_subLanguages( new QActionGroup( this ) )
         , m_audioLanguages( new QActionGroup( this ) )
@@ -192,6 +193,7 @@
     eject();
     m_media->setCurrentSource( url );
     m_justLoaded = true;
+	m_adjustedSize=false;
     return true;
 }
 
@@ -519,6 +521,8 @@
     if( currentState == Phonon::LoadingState )
         m_xineStream = 0;
 
+
+
     //N.B this code is also run when coming out of Paused state, as Phonon goes \
                Paused->Buffering->Playing (but at least this saves doing it twice)
     if( currentState == Phonon::PlayingState && oldstate != Phonon::PausedState && \
m_media->hasVideo() )  {
@@ -526,6 +530,13 @@
         m_vWidget->show();
         refreshXineStream();
         updateChannels();
+
+		if(m_adjustedSize==false)
+		{
+		  ( (QWidget*) mainWindow() )->adjustSize();
+		  m_adjustedSize=true;
+		  debug() << "adjusting siaze to video resolution";
+		}
         //m_vWidget->updateGeometry();
         //updateGeometry();
         
--- trunk/KDE/kdemultimedia/dragonplayer/src/app/videoWindow.h #817288:817289
@@ -64,6 +64,7 @@
 
         QTimer* m_cursorTimer;
         bool m_justLoaded;
+		bool m_adjustedSize;
         xine_stream_t* m_xineStream;
         QActionGroup* m_subLanguages;
         QActionGroup* m_audioLanguages;


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