diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-20 07:43:19 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-20 07:43:19 -0400 |
| commit | a2d657721094e31f1f17ae0bd406bbe36bbc9e98 (patch) | |
| tree | 735c5d7312a737d6c11672ef88d0029b89c145c4 /libs/ardour/ardour | |
| parent | b2a667266bb285f73e4701be55c10633846ace56 (diff) | |
move path_expand() and search_path_expand() into libpbd, and use them to expand search paths given to pathscanner objects (always)
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/session_configuration_vars.h | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/utils.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h index 1f8b2356d1..cce4bf86d7 100644 --- a/libs/ardour/ardour/session_configuration_vars.h +++ b/libs/ardour/ardour/session_configuration_vars.h @@ -38,9 +38,9 @@ CONFIG_VARIABLE (bool, punch_in, "punch-in", false) CONFIG_VARIABLE (bool, punch_out, "punch-out", false) CONFIG_VARIABLE (uint32_t, subframes_per_frame, "subframes-per-frame", 100) CONFIG_VARIABLE (Timecode::TimecodeFormat, timecode_format, "timecode-format", Timecode::timecode_30) -CONFIG_VARIABLE_SPECIAL(std::string, raid_path, "raid-path", "", path_expand) -CONFIG_VARIABLE_SPECIAL(std::string, audio_search_path, "audio-search-path", "", search_path_expand) -CONFIG_VARIABLE_SPECIAL(std::string, midi_search_path, "midi-search-path", "", search_path_expand) +CONFIG_VARIABLE_SPECIAL(std::string, raid_path, "raid-path", "", PBD::path_expand) +CONFIG_VARIABLE_SPECIAL(std::string, audio_search_path, "audio-search-path", "", PBD::search_path_expand) +CONFIG_VARIABLE_SPECIAL(std::string, midi_search_path, "midi-search-path", "", PBD::search_path_expand) CONFIG_VARIABLE (bool, jack_time_master, "jack-time-master", true) CONFIG_VARIABLE (bool, use_video_sync, "use-video-sync", false) CONFIG_VARIABLE (float, video_pullup, "video-pullup", 0.0f) diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index 7223d1f8ec..0aa4193394 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -60,8 +60,6 @@ int cmp_nocase (const std::string& s, const std::string& s2); int touch_file(std::string path); -std::string path_expand (std::string); /* single file path */ -std::string search_path_expand (std::string); /* colon-separated search path */ std::string region_name_from_path (std::string path, bool strip_channels, bool add_channel_suffix = false, uint32_t total = 0, uint32_t this_one = 0); bool path_is_paired (std::string path, std::string& pair_base); |