projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OSC: Make pan controls work properly with MB too.
[ardour.git]
/
libs
/
ardour
/
test
/
audio_region_test.cc
diff --git
a/libs/ardour/test/audio_region_test.cc
b/libs/ardour/test/audio_region_test.cc
index c7008d90e50aa651659cc86772298abe34a4022e..aae25e2f5d92206fdb620828b3b21ddbb431cd85 100644
(file)
--- a/
libs/ardour/test/audio_region_test.cc
+++ b/
libs/ardour/test/audio_region_test.cc
@@
-16,6
+16,8
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <glibmm/miscutils.h>
+
#include "pbd/compose.h"
#include "ardour/playlist_factory.h"
#include "ardour/source_factory.h"
#include "pbd/compose.h"
#include "ardour/playlist_factory.h"
#include "ardour/source_factory.h"
@@
-25,7
+27,7
@@
#include "ardour/audioregion.h"
#include "ardour/audioplaylist.h"
#include "audio_region_test.h"
#include "ardour/audioregion.h"
#include "ardour/audioplaylist.h"
#include "audio_region_test.h"
-#include "test_
globals
.h"
+#include "test_
util
.h"
using namespace std;
using namespace PBD;
using namespace std;
using namespace PBD;
@@
-36,12
+38,10
@@
AudioRegionTest::setUp ()
{
TestNeedingSession::setUp ();
{
TestNeedingSession::setUp ();
- /* This is important, otherwise createWritable will mark the source immutable (hence unwritable) */
- unlink ("libs/ardour/test/test.wav");
- string const test_wav_path = "libs/ardour/test/test.wav";
+ std::string const test_wav_path = Glib::build_filename (new_test_output_dir(), "test.wav");
_playlist = PlaylistFactory::create (DataType::AUDIO, *_session, "test");
_audio_playlist = boost::dynamic_pointer_cast<AudioPlaylist> (_playlist);
_playlist = PlaylistFactory::create (DataType::AUDIO, *_session, "test");
_audio_playlist = boost::dynamic_pointer_cast<AudioPlaylist> (_playlist);
- _source = SourceFactory::createWritable (DataType::AUDIO, *_session, test_wav_path,
"", false, Fs
);
+ _source = SourceFactory::createWritable (DataType::AUDIO, *_session, test_wav_path,
false, get_test_sample_rate ()
);
/* Write a staircase to the source */
/* Write a staircase to the source */
@@
-49,14
+49,14
@@
AudioRegionTest::setUp ()
assert (s);
int const signal_length = 4096;
assert (s);
int const signal_length = 4096;
-
+
Sample staircase[signal_length];
for (int i = 0; i < signal_length; ++i) {
staircase[i] = i;
}
s->write (staircase, signal_length);
Sample staircase[signal_length];
for (int i = 0; i < signal_length; ++i) {
staircase[i] = i;
}
s->write (staircase, signal_length);
-
+
PropertyList plist;
plist.add (Properties::start, 0);
plist.add (Properties::length, 100);
PropertyList plist;
plist.add (Properties::start, 0);
plist.add (Properties::length, 100);
@@
-81,4
+81,4
@@
AudioRegionTest::tearDown ()
TestNeedingSession::tearDown ();
}
TestNeedingSession::tearDown ();
}
-
+