[Jahshaka-cvs] SF.net SVN: editopia:[276] cinesuite/cineplay-cinecode/trunk/src
Status: Beta
Brought to you by:
jahshaka
From: <tim...@us...> - 2009-01-28 09:41:21
|
Revision: 276 http://editopia.svn.sourceforge.net/editopia/?rev=276&view=rev Author: timdewhirst Date: 2009-01-28 09:41:19 +0000 (Wed, 28 Jan 2009) Log Message: ----------- cinesuite * complete audiostore in correct place Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/Player.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2009-01-27 09:24:51 UTC (rev 275) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2009-01-28 09:41:19 UTC (rev 276) @@ -630,9 +630,6 @@ activePlayer()->stop(); - // ensure the audio store is reset - m_audioStore->complete(); - // setup m_jwStore->set_store_count( fnames.size() ); m_players->setPlayerCount( fnames.size() ); @@ -1075,9 +1072,6 @@ activePlayer()->stop(); - // ensure the audio store is reset - m_audioStore->complete(); - // setup m_jwStore->set_store_count( 1 ); m_players->setPlayerCount( 1 ); Modified: cinesuite/cineplay-cinecode/trunk/src/Player.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2009-01-27 09:24:51 UTC (rev 275) +++ cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2009-01-28 09:41:19 UTC (rev 276) @@ -406,7 +406,7 @@ //stop m_pPlayer->m_playing = false; if(m_pPlayer->m_audioStore) - m_pPlayer->m_audioStore->flush(); + m_pPlayer->m_audioStore->complete(); //clear state m_pPlayer->m_currentFrame = -1; @@ -479,7 +479,6 @@ && m_pPlayer->m_playing) { m_pPlayer->m_playing = false; - m_pPlayer->m_audioStore->flush(); } } @@ -761,8 +760,8 @@ { frame = m_input->get_frames() - 1; - //must stop audio - m_audioStore->flush(); + // must stop audio + m_audioStore->complete(); notifyReachedEnd(); m_playing = false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |