Minor bugfix in the seek slider and format button

This commit is contained in:
jfmcarreira committed 2014-06-01 18:01:40 +01:00
1 parent 0fe1cdce48
commit 041bb3e110
5 files changed
+11 -11

No files matched your search

-1
View File
@@ -173,7 +173,6 @@ Void ModulesHandle::destroyModuleIf( PlaYUVerModuleIf *pcCurrModuleIf )
pcCurrModuleIf->m_pcSubWindow[i] = NULL;
}
}
pcCurrModuleIf->destroy();
}
+2 -2
View File
@@ -84,9 +84,9 @@ class SubWindowHandle;
class PlaYUVerModuleIf
#ifdef PLAYUVER_THREADED_MODULES
: QThread
: public QThread
#else
: QObject
: public QObject
#endif
{
friend class ModulesHandle;
+4 -4
View File
@@ -72,7 +72,7 @@ SubWindowHandle::~SubWindowHandle()
delete m_pCurrStream;
}
Bool SubWindowHandle::loadFile( const QString &fileName )
Bool SubWindowHandle::loadFile( const QString &rcFilename, Bool bForceDialog )
{
UInt Width = 0, Height = 0, FrameRate = 30;
Int InputFormat = -1;
@@ -84,7 +84,7 @@ Bool SubWindowHandle::loadFile( const QString &fileName )
m_pCurrStream->getFormat( Width, Height, InputFormat, FrameRate );
if( m_pCurrStream->guessFormat( fileName, Width, Height, InputFormat, FrameRate ) )
if( m_pCurrStream->guessFormat( rcFilename, Width, Height, InputFormat, FrameRate ) || bForceDialog )
{
ConfigureFormatDialog formatDialog( this );
if( formatDialog.runConfigureFormatDialog( Width, Height, InputFormat, FrameRate ) == QDialog::Rejected )
@@ -94,7 +94,7 @@ Bool SubWindowHandle::loadFile( const QString &fileName )
}
QApplication::setOverrideCursor( Qt::WaitCursor );
QApplication::restoreOverrideCursor();
if( !m_pCurrStream->open( fileName, Width, Height, InputFormat, FrameRate ) )
if( !m_pCurrStream->open( rcFilename, Width, Height, InputFormat, FrameRate ) )
{
return false;
}
@@ -105,7 +105,7 @@ Bool SubWindowHandle::loadFile( const QString &fileName )
refreshFrame();
m_cCurrFileName = fileName;
m_cCurrFileName = rcFilename;
m_cWindowName = m_pCurrStream->getStreamInformationString();
setWindowTitle( m_cWindowName );
return true;
+1 -1
View File
@@ -65,7 +65,7 @@ public:
~SubWindowHandle();
Bool mayClose();
Bool loadFile( const QString &fileName );
Bool loadFile( const QString &rcFilename, Bool bForceDialog = false );
Bool save();
Void play();
+4 -3
View File
@@ -213,7 +213,7 @@ Void plaYUVerApp::save()
Void plaYUVerApp::format()
{
if( m_pcCurrentSubWindow )
m_pcCurrentSubWindow->loadFile( m_pcCurrentSubWindow->currentFile() );
m_pcCurrentSubWindow->loadFile( m_pcCurrentSubWindow->currentFile(), true );
}
Void plaYUVerApp::closeActiveWindow()
@@ -459,6 +459,7 @@ Void plaYUVerApp::playEvent()
break;
case -3:
m_acPlayingSubWindows.at( i )->close();
m_acPlayingSubWindows.remove( i );
break;
case -4:
m_acPlayingSubWindows.remove( i );
@@ -495,7 +496,7 @@ Void plaYUVerApp::updateTotalFrameNum( UInt total_frame_num )
m_pcTotalFrameNumLabel->setText( QString( tr( "%1" ) ).arg( total_frame_num ) );
}
Void plaYUVerApp::seekEvent( int direction )
Void plaYUVerApp::seekEvent( Int direction )
{
if( m_pcCurrentSubWindow )
{
@@ -515,7 +516,7 @@ Void plaYUVerApp::seekEvent( int direction )
}
}
Void plaYUVerApp::seekSliderEvent( int new_frame_num )
Void plaYUVerApp::seekSliderEvent( Int new_frame_num )
{
if( m_pcCurrentSubWindow )
{