projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reset midi synth (panic) when seeking or re-starting audition
[ardour.git]
/
libs
/
ardour
/
audio_library.cc
diff --git
a/libs/ardour/audio_library.cc
b/libs/ardour/audio_library.cc
index 662b8cb33e66f844dac4fa63231f76c3d89dc789..c2b2f1bff736c05cbfc70621c4f88d89661dcc60 100644
(file)
--- a/
libs/ardour/audio_library.cc
+++ b/
libs/ardour/audio_library.cc
@@
-46,16
+46,16
@@
static const char* TAG = "http://ardour.org/ontology/Tag";
AudioLibrary::AudioLibrary ()
{
AudioLibrary::AudioLibrary ()
{
- s
ys::path
sfdb_file_path(user_config_directory ());
+ s
td::string
sfdb_file_path(user_config_directory ());
- sfdb_file_path
/= sfdb_file_name
;
+ sfdb_file_path
= Glib::build_filename (sfdb_file_path, sfdb_file_name)
;
- src = Glib::filename_to_uri (sfdb_file_path
.to_string ()
);
+ src = Glib::filename_to_uri (sfdb_file_path);
// workaround for possible bug in raptor that crashes when saving to a
// non-existant file.
// workaround for possible bug in raptor that crashes when saving to a
// non-existant file.
- touch_file(sfdb_file_path
.to_string()
);
+ touch_file(sfdb_file_path);
lrdf_read_file(src.c_str());
}
lrdf_read_file(src.c_str());
}
@@
-94,7
+94,7
@@
AudioLibrary::get_tags (string member)
lrdf_statement pattern;
pattern.subject = strdup(Glib::filename_to_uri(member).c_str());
lrdf_statement pattern;
pattern.subject = strdup(Glib::filename_to_uri(member).c_str());
- pattern.predicate =
(char*)TAG
;
+ pattern.predicate =
const_cast<char*>(TAG)
;
pattern.object = 0;
pattern.object_type = lrdf_literal;
pattern.object = 0;
pattern.object_type = lrdf_literal;
@@
-126,8
+126,8
@@
AudioLibrary::search_members_and (vector<string>& members, const vector<string>&
vector<string>::const_iterator i;
for (i = tags.begin(); i != tags.end(); ++i){
pattern = new lrdf_statement;
vector<string>::const_iterator i;
for (i = tags.begin(); i != tags.end(); ++i){
pattern = new lrdf_statement;
- pattern->subject =
(char*)"?"
;
- pattern->predicate =
(char*)TAG
;
+ pattern->subject =
const_cast<char*>("?")
;
+ pattern->predicate =
const_cast<char*>(TAG)
;
pattern->object = strdup((*i).c_str());
pattern->next = old;
pattern->object = strdup((*i).c_str());
pattern->next = old;