Merge branch 'master' into dev_DialogWindowSelector

This commit is contained in:
jfmcarreira committed 2014-05-09 00:40:02 +01:00
commit 0e7dea265a
3 files changed
+11 -5

No files matched your search

+1 -1
View File
@@ -182,7 +182,7 @@ Int ConfigureFormatDialog::runConfigureFormatDialog( UInt& rWidth, UInt& rHeight
// Set default values // Set default values
m_spinBoxWidth->setValue( rWidth ); m_spinBoxWidth->setValue( rWidth );
m_spinBoxheight->setValue( rHeight ); m_spinBoxheight->setValue( rHeight );
m_comboBoxPixelFormat->setCurrentIndex( rInputFormat ); m_comboBoxPixelFormat->setCurrentIndex( rInputFormat >= 0 ? rInputFormat : 0 );
m_spinBoxFrameRate->setValue( rFrameRate ); m_spinBoxFrameRate->setValue( rFrameRate );
for( Int i = 0; i < standardResolutionSizesList.size(); i++ ) for( Int i = 0; i < standardResolutionSizesList.size(); i++ )
{ {
+8 -2
View File
@@ -53,7 +53,7 @@ SubWindowHandle::SubWindowHandle( QWidget * parent ) :
m_cScrollArea->setWidgetResizable( true ); m_cScrollArea->setWidgetResizable( true );
m_pCurrStream = NULL; m_pCurrStream = NULL;
m_pCurrStream = new InputStream; //m_pCurrStream = new InputStream;
m_pcCurrFrame = NULL; m_pcCurrFrame = NULL;
m_pcCurrentModule = NULL; m_pcCurrentModule = NULL;
m_pcModuleSubWindow = NULL; m_pcModuleSubWindow = NULL;
@@ -78,7 +78,13 @@ Bool SubWindowHandle::loadFile( const QString &fileName )
Int InputFormat = -1; Int InputFormat = -1;
if( !m_pCurrStream ) if( !m_pCurrStream )
{
m_pCurrStream = new InputStream; m_pCurrStream = new InputStream;
}
// else
// {
// m_pCurrStream->close();
// }
m_pCurrStream->getFormat( Width, Height, InputFormat, FrameRate ); m_pCurrStream->getFormat( Width, Height, InputFormat, FrameRate );
@@ -189,7 +195,7 @@ Void SubWindowHandle::play()
Int SubWindowHandle::playEvent() Int SubWindowHandle::playEvent()
{ {
if( m_bIsPlaying ) if( m_pCurrStream && m_bIsPlaying )
{ {
m_pCurrStream->setNextFrame(); m_pCurrStream->setNextFrame();
refreshFrame(); refreshFrame();
+2 -2
View File
@@ -438,7 +438,7 @@ void plaYUVerApp::playEvent()
Void plaYUVerApp::updateCurrFrameNum() Void plaYUVerApp::updateCurrFrameNum()
{ {
if( m_pcCurrentSubWindow ) if( m_pcCurrentSubWindow && m_pcCurrentSubWindow->getInputStream() )
{ {
Int frame_num = m_pcCurrentSubWindow->getInputStream()->getCurrFrameNum(); Int frame_num = m_pcCurrentSubWindow->getInputStream()->getCurrFrameNum();
m_pcFrameSlider->setValue( frame_num ); m_pcFrameSlider->setValue( frame_num );
@@ -447,7 +447,7 @@ Void plaYUVerApp::updateCurrFrameNum()
} }
Void plaYUVerApp::updateTotalFrameNum( UInt total_frame_num ) Void plaYUVerApp::updateTotalFrameNum( UInt total_frame_num )
{ {
if( m_pcCurrentSubWindow && total_frame_num == 0 ) if( m_pcCurrentSubWindow && m_pcCurrentSubWindow->getInputStream() && total_frame_num == 0 )
{ {
total_frame_num = m_pcCurrentSubWindow->getInputStream()->getFrameNum(); total_frame_num = m_pcCurrentSubWindow->getInputStream()->getFrameNum();
} }