diff options
| author | David Robillard <d@drobilla.net> | 2007-07-04 00:39:00 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-07-04 00:39:00 +0000 |
| commit | 2177f008411821e7bce9ca3c306ec64c70b1c58e (patch) | |
| tree | 79b2f1827163aa40fdde34c5f9b89f7bd1eb3d49 /libs/ardour/audiofilesource.cc | |
| parent | e0f287045eff5b6f0581b741a3005f54d6578737 (diff) | |
Add AutomationControl::parameter() for terseness.
Future-proof automation track GUI 'extra' XML (<GUI><AutomationChild automation-id="gain"> instead of <GUI><gain> so Parameter.to_string isn't used as an XML node name).
Fix automation track controller bar shown/hidden state.
Fix automation track initial show bug.
git-svn-id: svn://localhost/ardour2/trunk@2103 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audiofilesource.cc')
| -rw-r--r-- | libs/ardour/audiofilesource.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index 4bbe28e251..140f787901 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -228,7 +228,7 @@ AudioFileSource::set_state (const XMLNode& node) } if ((prop = node.property (X_("channel"))) != 0) { - _channel = atoi (prop->value()); + _channel = atoi (prop->value().c_str()); } else { _channel = 0; } @@ -433,7 +433,7 @@ AudioFileSource::find (ustring& pathstr, bool must_exist, bool& isnew, uint16_t& fullpath += shorter; if (Glib::file_test (pathstr, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) { - chan = atoi (pathstr.substr (pos+1)); + chan = atoi (pathstr.substr (pos+1).c_str()); pathstr = shorter; keeppath = fullpath; ++cnt; @@ -485,7 +485,7 @@ AudioFileSource::find (ustring& pathstr, bool must_exist, bool& isnew, uint16_t& ustring shorter = pathstr.substr (0, pos); if (Glib::file_test (shorter, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) { - chan = atoi (pathstr.substr (pos+1)); + chan = atoi (pathstr.substr (pos+1).c_str()); pathstr = shorter; } } |