projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version
[dcpomatic.git]
/
test
/
audio_analysis_test.cc
diff --git
a/test/audio_analysis_test.cc
b/test/audio_analysis_test.cc
index 66c5775791ce72c1775ed1511a0feec5a70ca417..b461680c398bdc0ccef88c5faf31267ffbe36525 100644
(file)
--- a/
test/audio_analysis_test.cc
+++ b/
test/audio_analysis_test.cc
@@
-38,6
+38,7
@@
#include "lib/content_factory.h"
#include "lib/playlist.h"
#include "test.h"
#include "lib/content_factory.h"
#include "lib/playlist.h"
#include "test.h"
+#include <iostream>
using std::vector;
using boost::shared_ptr;
using std::vector;
using boost::shared_ptr;
@@
-110,7
+111,7
@@
BOOST_AUTO_TEST_CASE (audio_analysis_test)
film->examine_and_add_content (c);
wait_for_jobs ();
film->examine_and_add_content (c);
wait_for_jobs ();
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist
()
));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist
(), false
));
job->Finished.connect (boost::bind (&finished));
JobManager::instance()->add (job);
wait_for_jobs ();
job->Finished.connect (boost::bind (&finished));
JobManager::instance()->add (job);
wait_for_jobs ();
@@
-127,7
+128,7
@@
BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
c->audio->set_delay (-250);
c->audio->set_delay (-250);
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist
()
));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist
(), false
));
job->Finished.connect (boost::bind (&finished));
JobManager::instance()->add (job);
wait_for_jobs ();
job->Finished.connect (boost::bind (&finished));
JobManager::instance()->add (job);
wait_for_jobs ();
@@
-142,7
+143,7
@@
BOOST_AUTO_TEST_CASE (audio_analysis_test2)
film->examine_and_add_content (c);
wait_for_jobs ();
film->examine_and_add_content (c);
wait_for_jobs ();
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist
()
));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist
(), false
));
job->Finished.connect (boost::bind (&finished));
JobManager::instance()->add (job);
wait_for_jobs ();
job->Finished.connect (boost::bind (&finished));
JobManager::instance()->add (job);
wait_for_jobs ();
@@
-173,7
+174,7
@@
BOOST_AUTO_TEST_CASE (audio_analysis_test3)
film->set_audio_channels (12);
boost::signals2::connection connection;
film->set_audio_channels (12);
boost::signals2::connection connection;
- JobManager::instance()->analyse_audio (film, film->playlist(), connection, boost::bind (&analysis_finished));
+ JobManager::instance()->analyse_audio (film, film->playlist(),
false,
connection, boost::bind (&analysis_finished));
wait_for_jobs ();
BOOST_CHECK (done);
}
wait_for_jobs ();
BOOST_CHECK (done);
}
@@
-192,6
+193,6
@@
BOOST_AUTO_TEST_CASE (analyse_audio_test4)
shared_ptr<Playlist> playlist (new Playlist);
playlist->add (content);
boost::signals2::connection c;
shared_ptr<Playlist> playlist (new Playlist);
playlist->add (content);
boost::signals2::connection c;
- JobManager::instance()->analyse_audio (film, playlist, c, boost::bind (&finished));
+ JobManager::instance()->analyse_audio (film, playlist,
false,
c, boost::bind (&finished));
BOOST_CHECK (!wait_for_jobs ());
}
BOOST_CHECK (!wait_for_jobs ());
}