-Saving error checking added, cleaning up writing code

main
Harry van Haaren 2013-09-05 11:36:51 +01:00
parent e436154bc3
commit 78b8a17df0
4 changed files with 13 additions and 10 deletions

View File

@ -13,7 +13,6 @@ using namespace std;
DiskWriter::DiskWriter()
{
initialize( getenv("HOME"), "sessionName" );
};
void DiskWriter::initialize(std::string path, std::string name )
@ -64,10 +63,8 @@ void DiskWriter::writeAudioBuffer(int track, int scene, AudioBuffer* ab )
Worker::writeSample( path.str(), ab );
// de allocate the AudioBuffer here!!
delete ab;
}
void DiskWriter::writeSession( std::string path, std::string sessionName )

View File

@ -114,7 +114,9 @@ class EventSave : public EventBase
int type() { return int(SAVE); }
uint32_t size() { return sizeof(EventSave); }
EventSave(){};
int waste;
EventSave() : waste(0) {}
};
class EventSaveFinish : public EventBase

View File

@ -92,10 +92,13 @@ static void gui_header_callback(Fl_Widget *w, void *data)
else if ( strcmp(m->label(), "Save ") == 0 ) {
const char* name = fl_input( "Save session as", "lupppSession" );
cout << "Save clicked, name = " << name << endl;
EventSave e;
//writeToDspRingbuffer( &e );
if ( name )
{
cout << "Save clicked, name = " << name << endl;
gui->getDiskWriter()->initialize( getenv("HOME"), name );
EventSave e;
writeToDspRingbuffer( &e );
}
}
}

View File

@ -19,8 +19,9 @@ void SaveAble::done()
{
savesDone++;
if ( savesDone == jack->getSave()->getNumSaveables() )
if ( savesDone >= jack->getSave()->getNumSaveables() )
{
jack->getSave()->finish();
savesDone = 0; // reset in case of another save before quit
}
}