openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

comment out video playback code

Browse Source
This commit is contained in:
Duzy Chan
2014-02-02 02:20:30 +08:00
parent ca180a5fcd
commit 1caf0cfbe7
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Qt/AudioPlaybackThread.cpp
View File

@@ -31,6 +31,19 @@
namespace openshot
{
struct SafeTimeSliceThread : TimeSliceThread
{
SafeTimeSliceThread(const String & s) : TimeSliceThread(s) {}
void run()
{
try {
TimeSliceThread::run();
} catch (const TooManySeeks & e) {
// ...
}
}
};
AudioPlaybackThread::AudioPlaybackThread()
: Thread("audio-playback")
, audioDeviceManager()
@@ -72,15 +85,15 @@ namespace openshot
player.setSource(&mixer);
// Create TimeSliceThread for audio buffering
TimeSliceThread my_thread("Audio buffer thread");
SafeTimeSliceThread thread("audio-buffer");
// Start thread
my_thread.startThread();
thread.startThread();
transport.setSource(
source,
10000, // tells it to buffer this many samples ahead
&my_thread,
&thread,
sampleRate,
numChannels);
transport.setPosition(0);

4
src/Qt/PlayerPrivate.cpp
View File

@@ -56,6 +56,7 @@ namespace openshot
audioPlayback->setReader(reader);
audioPlayback->startThread(1);
/*
videoPlayback->startThread(2);
//tr1::shared_ptr<Frame> frame = getFrame();
@@ -82,8 +83,9 @@ namespace openshot
std::cout << "frametime: " << ft << " - " << d << " = " << st << std::endl;
}
if (audioPlayback->isThreadRunning()) audioPlayback->stopThread(-1);
if (videoPlayback->isThreadRunning()) videoPlayback->stopThread(-1);
*/
if (audioPlayback->isThreadRunning()) audioPlayback->stopThread(-1);
}
tr1::shared_ptr<Frame> PlayerPrivate::getFrame()