jfmcarreira/calyp
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor bugfix in the seek slider and format button

Browse Source
This commit is contained in:
jfmcarreira committed 2014-06-01 18:05:49 +01:00
1 parent 13f39eee4b
commit 35f1f34966
4 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

source/app/SubWindowHandle.cpp
+4 -4
View File
@@ -71,7 +71,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;
@@ -83,7 +83,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 )
@@ -93,7 +93,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;
}
@@ -104,7 +104,7 @@ Bool SubWindowHandle::loadFile( const QString &fileName )
refreshFrame();
m_cCurrFileName = fileName;
m_cCurrFileName = rcFilename;
m_cWindowName = m_pCurrStream->getStreamInformationString();
setWindowTitle( m_cWindowName );
return true;