allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Make sure we use the correct style of filepath separator on Windows

Browse Source 
('libs/ardour/file_source.cc' still to be investigated)
This commit is contained in:
John Emmas
2014-04-11 13:03:48 +01:00
parent c046b7c9d3
commit d95de39339
6 changed files with 11 additions and 11 deletions
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;
}
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;

4
gtk2_ardour/search_path_option.cc
View File

@@ -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 ();
}

6
libs/ardour/session_state.cc
View File

@@ -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;

4
libs/pbd/pathexpand.cc
View File

@@ -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;
}

2
libs/pbd/pathscanner.cc
View File

@@ -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;

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) {
path = cstr;
path += ':';
path += G_DIR_SEPARATOR;
} else {
path = "";
}