smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Use functions from ardour/session_state_utils.h instead of ardour/session.h in ARDOUR_UI::redisplay_recent_sessions

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@2388 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2007-09-04 05:26:28 +00:00
parent 673fb6a0ed
commit a9d70383d1
1 changed files with 32 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

69
gtk2_ardour/ardour_ui.cc
View file

@ -57,6 +57,7 @@
#include <ardour/profile.h> #include <ardour/profile.h>
#include <ardour/session_directory.h> #include <ardour/session_directory.h>
#include <ardour/session_route.h> #include <ardour/session_route.h>
#include <ardour/session_state_utils.h>
#include <ardour/session_utils.h> #include <ardour/session_utils.h>
#include <ardour/port.h> #include <ardour/port.h>
#include <ardour/audioengine.h> #include <ardour/audioengine.h>
@ -805,73 +806,67 @@ ARDOUR_UI::session_menu (GdkEventButton *ev)
void void
ARDOUR_UI::redisplay_recent_sessions () ARDOUR_UI::redisplay_recent_sessions ()
{ {
vector<string *> *sessions; std::vector<sys::path> session_directories;
vector<string *>::iterator i;
RecentSessionsSorter cmp; RecentSessionsSorter cmp;
recent_session_display.set_model (Glib::RefPtr<TreeModel>(0)); recent_session_display.set_model (Glib::RefPtr<TreeModel>(0));
recent_session_model->clear (); recent_session_model->clear ();
RecentSessions rs; ARDOUR::RecentSessions rs;
ARDOUR::read_recent_sessions (rs); ARDOUR::read_recent_sessions (rs);
if (rs.empty()) { if (rs.empty()) {
recent_session_display.set_model (recent_session_model); recent_session_display.set_model (recent_session_model);
return; return;
} }
//
/* sort them alphabetically */ // sort them alphabetically
sort (rs.begin(), rs.end(), cmp); sort (rs.begin(), rs.end(), cmp);
sessions = new vector<string*>;
for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
for (RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) { session_directories.push_back ((*i).second);
sessions->push_back (new string ((*i).second));
} }
for (vector<sys::path>::const_iterator i = session_directories.begin();
i != session_directories.end(); ++i)
{
std::vector<sys::path> state_file_paths;
// now get available states for this session
for (i = sessions->begin(); i != sessions->end(); ++i) { get_state_files_in_directory (*i, state_file_paths);
vector<string*>* states; if (state_file_paths.empty()) {
vector<const gchar*> item; // no state file?
string fullpath = *(*i);
/* remove any trailing / */
if (fullpath[fullpath.length()-1] == '/') {
fullpath = fullpath.substr (0, fullpath.length()-1);
}
/* now get available states for this session */
if ((states = Session::possible_states (fullpath)) == 0) {
/* no state file? */
continue; continue;
} }
std::vector<string> state_file_names(get_file_names_no_extension (state_file_paths));
TreeModel::Row row = *(recent_session_model->append()); Gtk::TreeModel::Row row = *(recent_session_model->append());
const string fullpath = (*i).to_string();
row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath); row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath);
row[recent_session_columns.fullpath] = fullpath; row[recent_session_columns.fullpath] = fullpath;
if (state_file_names.size() > 1) {
if (states->size() > 1) { // add the children
/* add the children */ for (std::vector<std::string>::iterator i2 = state_file_names.begin();
i2 != state_file_names.end(); ++i2)
for (vector<string*>::iterator i2 = states->begin(); i2 != states->end(); ++i2) { {
TreeModel::Row child_row = *(recent_session_model->append (row.children()));
child_row[recent_session_columns.visible_name] = **i2; Gtk::TreeModel::Row child_row = *(recent_session_model->append (row.children()));
child_row[recent_session_columns.visible_name] = *i2;
child_row[recent_session_columns.fullpath] = fullpath; child_row[recent_session_columns.fullpath] = fullpath;
delete *i2;
} }
} }
delete states;
} }
recent_session_display.set_model (recent_session_model); recent_session_display.set_model (recent_session_model);
delete sessions;
} }
void void