ardour/livetrax
13
0
Fork 0
Code

get sample rate properly injected into session file

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6674 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-02-10 22:42:25 +00:00
parent be9a75a8e6
commit 24fbade20a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/omf/omftool.cc
View File

@ -594,7 +594,7 @@ OMF::create_xml ()
session->add_property ("version", sbuf); session->add_property ("version", sbuf);
session->add_property ("name", session_name); session->add_property ("name", session_name);
char **tracks; char **tracks;
int numtracks; int numtracks;
sqlite3_get_table(db, "SELECT value FROM data WHERE object IN (SELECT value FROM data WHERE object IN (SELECT object FROM data WHERE property = 'OMFI:OOBJ:ObjClass' AND value = 'CMOB' LIMIT 1) AND property = 'OMFI:MOBJ:Slots')", &tracks, &numtracks, 0, 0); sqlite3_get_table(db, "SELECT value FROM data WHERE object IN (SELECT value FROM data WHERE object IN (SELECT object FROM data WHERE property = 'OMFI:OOBJ:ObjClass' AND value = 'CMOB' LIMIT 1) AND property = 'OMFI:MOBJ:Slots')", &tracks, &numtracks, 0, 0);
@ -674,6 +674,7 @@ OMF::create_xml ()
denom = e32(denom); denom = e32(denom);
fread(&num, 4, 1, file); fread(&num, 4, 1, file);
num = e32(num); num = e32(num);
INFO ("Rate = %d / %d\n", num, denom);
if (frame_rate == 0) { if (frame_rate == 0) {
frame_rate = (double) num / (double) denom; frame_rate = (double) num / (double) denom;
} }
@ -940,6 +941,8 @@ OMF::create_xml ()
id_counter++; id_counter++;
snprintf (sbuf, sizeof (sbuf), "%" PRId64, id_counter); snprintf (sbuf, sizeof (sbuf), "%" PRId64, id_counter);
session->add_property ("id-counter", sbuf); session->add_property ("id-counter", sbuf);
snprintf (sbuf, sizeof (sbuf), "%" PRId32, sample_rate);
session->add_property ("sample-rate", sbuf);
XMLTree xml; XMLTree xml;
@ -963,6 +966,7 @@ print_help (const char* execname)
<< " [ -r sample-rate ]" << " [ -r sample-rate ]"
<< " [ -n session-name ]" << " [ -n session-name ]"
<< " [ -v ardour-session-version ]" << " [ -v ardour-session-version ]"
<< " OMF2_session_file"
<< endl; << endl;
exit (1); exit (1);
} }
@ -973,14 +977,14 @@ main (int argc, char* argv[])
const char *execname = strrchr (argv[0], '/'); const char *execname = strrchr (argv[0], '/');
const char* optstring = "r:n:v:h"; const char* optstring = "r:n:v:h";
const char* session_name = 0; const char* session_name = 0;
int sample_rate = 44100; int sample_rate = 0;
int version = 3000; int version = 0;
const struct option longopts[] = { const struct option longopts[] = {
{ "rate", 1, 0, 'r' }, { "rate", 1, 0, 'r' },
{ "name", 1, 0, 'n' }, { "name", 1, 0, 'n' },
{ "version", 1, 0, 'v' }, { "version", 1, 0, 'v' },
{ "help", 1, 0, 'h' }, { "help", 0, 0, 'h' },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
@ -1022,8 +1026,13 @@ main (int argc, char* argv[])
OMF omf; OMF omf;
omf.set_version (version); if (version) {
omf.set_sample_rate (sample_rate); omf.set_version (version);
}
if (sample_rate) {
omf.set_sample_rate (sample_rate);
}
if (session_name) { if (session_name) {
omf.set_session_name (session_name); omf.set_session_name (session_name);