ardour/livetrax
13
0
Fork 0
Code

Oops - correct some typos in my previous commit

Browse Source 
(accidentally used G_DIR_SEPARATOR instead of G_SEARCHPATH_SEPARATOR)
This commit is contained in:
John Emmas 2014-04-11 15:36:04 +01:00
parent d95de39339
commit 5d9c2104d2
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/missing_file_dialog.cc
View File

@ -133,7 +133,7 @@ MissingFileDialog::add_chosen ()
break; break;
} }
split (str, dirs, G_DIR_SEPARATOR); split (str, dirs, G_SEARCHPATH_SEPARATOR);
newdir = chooser.get_filename (); newdir = chooser.get_filename ();
@ -144,7 +144,7 @@ MissingFileDialog::add_chosen ()
} }
if (!str.empty()) { if (!str.empty()) {
str += G_DIR_SEPARATOR; str += G_SEARCHPATH_SEPARATOR;
} }
str += newdir; str += newdir;

4
gtk2_ardour/search_path_option.cc
View File

@ -103,7 +103,7 @@ SearchPathOption::set_state_from_config ()
clear (); clear ();
path_box.pack_start (session_label); path_box.pack_start (session_label);
split (str, dirs, G_DIR_SEPARATOR); split (str, dirs, G_SEARCHPATH_SEPARATOR);
for (vector<string>::iterator d = dirs.begin(); d != dirs.end(); ++d) { for (vector<string>::iterator d = dirs.begin(); d != dirs.end(); ++d) {
add_path (*d); add_path (*d);
@ -118,7 +118,7 @@ SearchPathOption::changed ()
for (list<PathEntry*>::iterator p = paths.begin(); p != paths.end(); ++p) { for (list<PathEntry*>::iterator p = paths.begin(); p != paths.end(); ++p) {
if (!str.empty()) { if (!str.empty()) {
str += G_DIR_SEPARATOR; str += G_SEARCHPATH_SEPARATOR;
} }
str += (*p)->entry.get_text (); str += (*p)->entry.get_text ();
} }

6
libs/ardour/session_state.cc
View File

@ -916,7 +916,7 @@ Session::state (bool full_state)
p += (*i).path; p += (*i).path;
if (next != session_dirs.end()) { if (next != session_dirs.end()) {
p += G_DIR_SEPARATOR; p += G_SEARCHPATH_SEPARATOR;
} else { } else {
break; break;
} }
@ -2680,7 +2680,7 @@ Session::cleanup_sources (CleanupReport& rep)
audio_path += sdir.sound_path(); audio_path += sdir.sound_path();
if (nexti != session_dirs.end()) { if (nexti != session_dirs.end()) {
audio_path += G_DIR_SEPARATOR; audio_path += G_SEARCHPATH_SEPARATOR;
} }
i = nexti; i = nexti;
@ -2698,7 +2698,7 @@ Session::cleanup_sources (CleanupReport& rep)
midi_path += sdir.midi_path(); midi_path += sdir.midi_path();
if (nexti != session_dirs.end()) { if (nexti != session_dirs.end()) {
midi_path += G_DIR_SEPARATOR; midi_path += G_SEARCHPATH_SEPARATOR;
} }
i = nexti; i = nexti;

2
libs/pbd/search_path.cc
View File

@ -133,7 +133,7 @@ export_search_path (const string& base_dir, const char* varname, const char* dir
if (cstr) { if (cstr) {
path = cstr; path = cstr;
path += G_DIR_SEPARATOR; path += G_SEARCHPATH_SEPARATOR;
} else { } else {
path = ""; path = "";
} }