ardour/livetrax
13
0
Fork 0
Code

Remove Session::midi_dir...again.

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1998 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2007-06-17 00:46:05 +00:00
parent ee29fcacfb
commit 3ee59d437f
3 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/session.h
View File

@ -259,7 +259,6 @@ class Session : public PBD::StatefulDestructible
sigc::signal<void> DirtyChanged;
std::string sound_dir (bool with_path = true) const;
std::string midi_dir (bool with_path = true) const;
std::string peak_dir () const;
std::string automation_dir () const;

8
libs/ardour/session.cc
View File

@ -3134,9 +3134,13 @@ Session::midi_path_from_name (string name)
for (i = session_dirs.begin(); i != session_dirs.end(); ++i) {
spath = (*i).path;
SessionDirectory sdir((*i).path);
sys::path p = sdir.midi_path();
spath += midi_dir(false) + "/" + legalized;
p /= legalized;
spath = p.to_string();
snprintf (buf, sizeof(buf), "%s-%u.mid", spath.c_str(), cnt);

27
libs/ardour/session_state.cc
View File

@ -1917,33 +1917,6 @@ Session::sound_dir (bool with_path) const
return res;
}
string
Session::midi_dir (bool with_path) const
{
string res;
string full;
if (with_path) {
res = _path;
} else {
full = _path;
}
res += interchange_dir_name;
res += '/';
res += legalize_for_path (_name);
res += '/';
res += midi_dir_name;
if (with_path) {
full = res;
} else {
full += res;
}
return res;
}
string
Session::peak_dir () const
{