merge by hand changes from mtaht to fix up export behaviour, and gcc warnings when optimized

git-svn-id: svn://localhost/ardour2/trunk@1332 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2007-01-17 02:35:16 +00:00
parent 762d2ae936
commit 3dfae5be66
8 changed files with 19 additions and 8 deletions

View File

@@ -3397,7 +3397,7 @@ Session::remove_redirect (Redirect* redirect)
nframes_t
Session::available_capture_duration ()
{
float sample_bytes_on_disk;
float sample_bytes_on_disk = 4.0; // keep gcc happy
switch (Config->get_native_file_data_format()) {
case FormatFloat:

View File

@@ -28,7 +28,7 @@ Session::memento_command_factory(XMLNode *n)
{
PBD::ID id;
XMLNode *before = 0, *after = 0;
XMLNode *child;
XMLNode *child = 0;
/* get id */
id = PBD::ID(n->property("obj_id")->value());

View File

@@ -9,7 +9,7 @@ strip_whitespace_edges (string& str)
{
string::size_type i;
string::size_type len;
string::size_type s;
string::size_type s = 0;
len = str.length();