From 18e65da42b7cd1973313d132c4b89df598863021 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Wed, 27 Jun 2007 12:12:10 +0000 Subject: Use sys::path and ARDOUR::user_config_directory in AudioLibrary for portablility Use Glib::filename_to_uri to create the src uri(which didn't look valid as it was) git-svn-id: svn://localhost/ardour2/trunk@2046 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audio_library.cc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'libs/ardour/audio_library.cc') diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc index 2ed4739a96..a15e08d5f9 100644 --- a/libs/ardour/audio_library.cc +++ b/libs/ardour/audio_library.cc @@ -23,25 +23,36 @@ #include +#include + #include #include #include +#include #include "i18n.h" using namespace std; using namespace ARDOUR; +namespace { + const char* const sfdb_file_name = "sfdb"; +} // anonymous namespace + static char* TAG = "http://ardour.org/ontology/Tag"; AudioLibrary::AudioLibrary () { - src = "file:" + get_user_ardour_path() + "sfdb"; + sys::path sfdb_file_path(user_config_directory ()); + sfdb_file_path /= sfdb_file_name; + + src = Glib::filename_to_uri (sfdb_file_path.to_string ()); + // workaround for possible bug in raptor that crashes when saving to a // non-existant file. - touch_file(get_user_ardour_path() + "sfdb"); + touch_file(sfdb_file_path.to_string()); lrdf_read_file(src.c_str()); } -- cgit v1.2.3