From 1f3cbdf653d96f1241a199e403870bc4802d8945 Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Mon, 23 Sep 2013 11:54:54 +0100 Subject: [PATCH] -Updated diskwriter & test --- src/diskwriter.cxx | 3 ++- src/diskwriter.hxx | 1 + src/tests/diskwritertest.cxx | 11 +++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/diskwriter.cxx b/src/diskwriter.cxx index c51d505..5510345 100644 --- a/src/diskwriter.cxx +++ b/src/diskwriter.cxx @@ -31,6 +31,7 @@ DiskWriter::DiskWriter() void DiskWriter::initialize(std::string path, std::string name ) { sessionName = name; + sessionPath = path; // write session.luppp JSON node to /.luppp stringstream sessionDirStream; @@ -67,7 +68,7 @@ std::string DiskWriter::getLastSaveName() std::string DiskWriter::getLastSavePath() { - return sessionDir; + return sessionPath; } int DiskWriter::writeAudioBuffer(int track, int scene, AudioBuffer* ab ) diff --git a/src/diskwriter.hxx b/src/diskwriter.hxx index 5e9b655..15866c6 100644 --- a/src/diskwriter.hxx +++ b/src/diskwriter.hxx @@ -51,6 +51,7 @@ class DiskWriter bool foldersCreated; std::string sessionName; + std::string sessionPath; std::string audioDir; std::string sessionDir; diff --git a/src/tests/diskwritertest.cxx b/src/tests/diskwritertest.cxx index 54f3dc1..0952a79 100644 --- a/src/tests/diskwritertest.cxx +++ b/src/tests/diskwritertest.cxx @@ -19,10 +19,17 @@ int DiskWriter::runTests() // set the session path to /tmp for test writing + string path = "/tmp"; + string session = "testSession"; AudioBuffer ab(440); - //QUNIT_IS_TRUE( gui->getDiskWriter()->writeAudioBuffer(0, 0, &ab) == LUPPP_RETURN_OK ); - //QUNIT_IS_TRUE( gui->getDiskWriter()->writeSession("/tmp","luppTestSession") == LUPPP_RETURN_OK ); + gui->getDiskWriter()->initialize(path, session); + + QUNIT_IS_TRUE( gui->getDiskWriter()->writeAudioBuffer(0, 0, &ab) == LUPPP_RETURN_OK ); + QUNIT_IS_TRUE( gui->getDiskWriter()->writeSession() == LUPPP_RETURN_OK ); + + QUNIT_IS_TRUE( strcmp( gui->getDiskWriter()->getLastSavePath().c_str(), path.c_str() ) == 0 ); + QUNIT_IS_TRUE( strcmp( gui->getDiskWriter()->getLastSaveName().c_str(), session.c_str() ) == 0 ); return qunit.errors(); }