diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-14 15:45:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-14 15:45:21 +0000 |
| commit | 4d112a8e6b90fa64a5cd333042044768111ba994 (patch) | |
| tree | 6688c5250bc55de106f74ef9be93d7ee574ec9d8 /libs/ardour/audio_unit.cc | |
| parent | 875f0befd5fb52678d25544fcbcb6e6b55a2c483 (diff) | |
remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths (may cause issues when loading creatively named 2.X sessions; fix a couple of details of name collection and usage from the startup dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@7772 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_unit.cc')
| -rw-r--r-- | libs/ardour/audio_unit.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 4a63f66cf5..3eb4672160 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -74,7 +74,7 @@ _render_callback(void *userData, } static int -save_property_list (CFPropertyListRef propertyList, Glib::ustring path) +save_property_list (CFPropertyListRef propertyList, string path) { CFDataRef xmlData; @@ -122,7 +122,7 @@ save_property_list (CFPropertyListRef propertyList, Glib::ustring path) static CFPropertyListRef -load_property_list (Glib::ustring path) +load_property_list (string path) { int fd; CFPropertyListRef propertyList; @@ -291,7 +291,7 @@ AUPlugin::AUPlugin (AudioEngine& engine, Session& session, boost::shared_ptr<CAC frames_processed (0) { if (!preset_search_path_initialized) { - Glib::ustring p = Glib::get_home_dir(); + string p = Glib::get_home_dir(); p += "/Library/Audio/Presets:"; p += preset_search_path; preset_search_path = p; @@ -1093,7 +1093,7 @@ AUPlugin::load_preset (const string& preset_label) #ifdef AU_STATE_SUPPORT bool ret = false; CFPropertyListRef propertyList; - Glib::ustring path; + string path; PresetMap::iterator x = preset_map.find (preset_label); if (x == preset_map.end()) { @@ -1123,8 +1123,8 @@ AUPlugin::save_preset (string preset_name) { #ifdef AU_STATE_SUPPORT CFPropertyListRef propertyList; - vector<Glib::ustring> v; - Glib::ustring user_preset_path; + vector<string> v; + string user_preset_path; bool ret = true; std::string m = maker(); @@ -1436,7 +1436,7 @@ AUPluginInfo::load (Session& session) } } -Glib::ustring +string AUPluginInfo::au_cache_path () { return Glib::build_filename (ARDOUR::get_user_ardour_path(), "au_cache"); @@ -1780,7 +1780,7 @@ AUPluginInfo::save_cached_info () } - Glib::ustring path = au_cache_path (); + string path = au_cache_path (); XMLTree tree; tree.set_root (node); @@ -1794,7 +1794,7 @@ AUPluginInfo::save_cached_info () int AUPluginInfo::load_cached_info () { - Glib::ustring path = au_cache_path (); + string path = au_cache_path (); XMLTree tree; if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)) { @@ -1858,7 +1858,7 @@ AUPluginInfo::load_cached_info () } void -AUPluginInfo::get_names (CAComponentDescription& comp_desc, std::string& name, Glib::ustring& maker) +AUPluginInfo::get_names (CAComponentDescription& comp_desc, std::string& name, string& maker) { CFStringRef itemName = NULL; |