Set stream as NULL until load a file in SubWindowHandle

This commit is contained in:
jfmcarreira committed 2014-05-08 01:54:13 +01:00
1 parent 83e808718c
commit 61d6d95e47
2 files changed
+10 -4

No files matched your search

+8 -2
View File
@@ -53,7 +53,7 @@ SubWindowHandle::SubWindowHandle( QWidget * parent ) :
m_cScrollArea->setWidgetResizable( true );
m_pCurrStream = NULL;
m_pCurrStream = new InputStream;
//m_pCurrStream = new InputStream;
m_pcCurrFrame = NULL;
m_pcCurrentModule = NULL;
m_pcModuleSubWindow = NULL;
@@ -78,7 +78,13 @@ Bool SubWindowHandle::loadFile( const QString &fileName )
Int InputFormat = -1;
if( !m_pCurrStream )
{
m_pCurrStream = new InputStream;
}
// else
// {
// m_pCurrStream->close();
// }
m_pCurrStream->getFormat( Width, Height, InputFormat, FrameRate );
@@ -189,7 +195,7 @@ Void SubWindowHandle::play()
Int SubWindowHandle::playEvent()
{
if( m_bIsPlaying )
if( m_pCurrStream && m_bIsPlaying )
{
m_pCurrStream->setNextFrame();
refreshFrame();
+2 -2
View File
@@ -437,7 +437,7 @@ void plaYUVerApp::playEvent()
Void plaYUVerApp::updateCurrFrameNum()
{
if( m_pcCurrentSubWindow )
if( m_pcCurrentSubWindow && m_pcCurrentSubWindow->getInputStream() )
{
Int frame_num = m_pcCurrentSubWindow->getInputStream()->getCurrFrameNum();
m_pcFrameSlider->setValue( frame_num );
@@ -446,7 +446,7 @@ Void plaYUVerApp::updateCurrFrameNum()
}
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();
}