diff options
| -rw-r--r-- | gtk2_ardour/missing_file_dialog.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/search_path_option.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/session_state.cc | 6 | ||||
| -rw-r--r-- | libs/pbd/pathexpand.cc | 4 | ||||
| -rw-r--r-- | libs/pbd/pathscanner.cc | 2 | ||||
| -rw-r--r-- | libs/pbd/search_path.cc | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/gtk2_ardour/missing_file_dialog.cc b/gtk2_ardour/missing_file_dialog.cc index 37868d5572..25f443d198 100644 --- a/gtk2_ardour/missing_file_dialog.cc +++ b/gtk2_ardour/missing_file_dialog.cc @@ -133,7 +133,7 @@ MissingFileDialog::add_chosen () break; } - split (str, dirs, ':'); + split (str, dirs, G_DIR_SEPARATOR); newdir = chooser.get_filename (); @@ -144,7 +144,7 @@ MissingFileDialog::add_chosen () } if (!str.empty()) { - str += ':'; + str += G_DIR_SEPARATOR; } str += newdir; diff --git a/gtk2_ardour/search_path_option.cc b/gtk2_ardour/search_path_option.cc index 8a5d99a375..1060e05b3f 100644 --- a/gtk2_ardour/search_path_option.cc +++ b/gtk2_ardour/search_path_option.cc @@ -103,7 +103,7 @@ SearchPathOption::set_state_from_config () clear (); path_box.pack_start (session_label); - split (str, dirs, ':'); + split (str, dirs, G_DIR_SEPARATOR); for (vector<string>::iterator d = dirs.begin(); d != dirs.end(); ++d) { add_path (*d); @@ -118,7 +118,7 @@ SearchPathOption::changed () for (list<PathEntry*>::iterator p = paths.begin(); p != paths.end(); ++p) { if (!str.empty()) { - str += ':'; + str += G_DIR_SEPARATOR; } str += (*p)->entry.get_text (); } diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index af18a4896b..dd963591e8 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -916,7 +916,7 @@ Session::state (bool full_state) p += (*i).path; if (next != session_dirs.end()) { - p += ':'; + p += G_DIR_SEPARATOR; } else { break; } @@ -2680,7 +2680,7 @@ Session::cleanup_sources (CleanupReport& rep) audio_path += sdir.sound_path(); if (nexti != session_dirs.end()) { - audio_path += ':'; + audio_path += G_DIR_SEPARATOR; } i = nexti; @@ -2698,7 +2698,7 @@ Session::cleanup_sources (CleanupReport& rep) midi_path += sdir.midi_path(); if (nexti != session_dirs.end()) { - midi_path += ':'; + midi_path += G_DIR_SEPARATOR; } i = nexti; diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc index e9bef4c4aa..8184624d89 100644 --- a/libs/pbd/pathexpand.cc +++ b/libs/pbd/pathexpand.cc @@ -174,7 +174,7 @@ PBD::search_path_expand (string path) vector<string> s; vector<string> n; - split (path, s, ':'); + split (path, s, G_SEARCHPATH_SEPARATOR); for (vector<string>::iterator i = s.begin(); i != s.end(); ++i) { string exp = path_expand (*i); @@ -187,7 +187,7 @@ PBD::search_path_expand (string path) for (vector<string>::iterator i = n.begin(); i != n.end(); ++i) { if (!r.empty()) { - r += ':'; + r += G_SEARCHPATH_SEPARATOR; } r += *i; } diff --git a/libs/pbd/pathscanner.cc b/libs/pbd/pathscanner.cc index a064fdbc03..6d3cba8d77 100644 --- a/libs/pbd/pathscanner.cc +++ b/libs/pbd/pathscanner.cc @@ -170,7 +170,7 @@ PathScanner::run_scan_internal (vector<string *> *result, } closedir (dir); - } while ((limit < 0 || (nfound < limit)) && (thisdir = strtok (0, ":"))); + } while ((limit < 0 || (nfound < limit)) && (thisdir = strtok (0, G_SEARCHPATH_SEPARATOR_S))); free (pathcopy); return result; diff --git a/libs/pbd/search_path.cc b/libs/pbd/search_path.cc index fe2087f6b1..6c152e6015 100644 --- a/libs/pbd/search_path.cc +++ b/libs/pbd/search_path.cc @@ -133,7 +133,7 @@ export_search_path (const string& base_dir, const char* varname, const char* dir if (cstr) { path = cstr; - path += ':'; + path += G_DIR_SEPARATOR; } else { path = ""; } |