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

Cont'd work on trigger-clip picker

Browse source 
* Only enabled auditioning when a file is selected
* Skip hidden folders/files
* Only drag files (not folders)
This commit is contained in:
Robin Gareus 2021-12-18 01:27:47 +01:00
parent 9d4a40ec61
commit 4432a89704
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gtk2_ardour/trigger_clip_picker.cc
View file

@ -170,10 +170,13 @@ TriggerClipPicker::row_selected ()
return; return;
} }
_session->cancel_audition (); _session->cancel_audition ();
if (_view.get_selection ()->count_selected_rows () < 1) { if (_view.get_selection ()->count_selected_rows () < 1) {
_play_btn.set_sensitive (false); _play_btn.set_sensitive (false);
} else { } else {
_play_btn.set_sensitive (true); TreeView::Selection::ListHandle_Path rows = _view.get_selection ()->get_selected_rows ();
TreeIter i = _model->get_iter (*rows.begin ());
_play_btn.set_sensitive ((*i)[_columns.file]);
} }
} }
@ -181,7 +184,7 @@ void
TriggerClipPicker::row_activated (TreeModel::Path const& p, TreeViewColumn*) TriggerClipPicker::row_activated (TreeModel::Path const& p, TreeViewColumn*)
{ {
TreeModel::iterator i = _model->get_iter (p); TreeModel::iterator i = _model->get_iter (p);
if (i) { if (i && (*i)[_columns.file]) {
audition ((*i)[_columns.path]); audition ((*i)[_columns.path]);
} }
} }
@ -229,7 +232,9 @@ TriggerClipPicker::drag_data_get (Glib::RefPtr<Gdk::DragContext> const&, Selecti
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) { for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) {
TreeIter iter; TreeIter iter;
if ((iter = _model->get_iter (*i))) { if ((iter = _model->get_iter (*i))) {
uris.push_back (Glib::filename_to_uri ((*iter)[_columns.path])); if ((*iter)[_columns.file]) {
uris.push_back (Glib::filename_to_uri ((*iter)[_columns.path]));
}
} }
} }
data.set_uris (uris); data.set_uris (uris);
@ -286,6 +291,10 @@ TriggerClipPicker::list_dir (std::string const& path, Gtk::TreeNodeChildren cons
std::string fullpath = Glib::build_filename (path, *i); std::string fullpath = Glib::build_filename (path, *i);
std::string basename = *i; std::string basename = *i;
if (basename.size() == 0 || basename[0] == '.') {
continue;
}
if (Glib::file_test (fullpath, Glib::FILE_TEST_IS_DIR)) { if (Glib::file_test (fullpath, Glib::FILE_TEST_IS_DIR)) {
dirs.push_back (*i); dirs.push_back (*i);
continue; continue;
@ -311,6 +320,7 @@ TriggerClipPicker::list_dir (std::string const& path, Gtk::TreeNodeChildren cons
row[_columns.name] = f; row[_columns.name] = f;
row[_columns.path] = Glib::build_filename (path, f); row[_columns.path] = Glib::build_filename (path, f);
row[_columns.read] = false; row[_columns.read] = false;
row[_columns.file] = false;
/* add stub child */ /* add stub child */
row = *(_model->append (row.children ())); row = *(_model->append (row.children ()));
row[_columns.read] = false; row[_columns.read] = false;
@ -326,6 +336,7 @@ TriggerClipPicker::list_dir (std::string const& path, Gtk::TreeNodeChildren cons
row[_columns.name] = f; row[_columns.name] = f;
row[_columns.path] = Glib::build_filename (path, f); row[_columns.path] = Glib::build_filename (path, f);
row[_columns.read] = false; row[_columns.read] = false;
row[_columns.file] = true;
} }
} }

2
gtk2_ardour/trigger_clip_picker.h
View file

@ -68,10 +68,12 @@ private:
add (name); add (name);
add (path); add (path);
add (read); add (read);
add (file);
} }
Gtk::TreeModelColumn<std::string> name; Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<std::string> path; Gtk::TreeModelColumn<std::string> path;
Gtk::TreeModelColumn<bool> read; Gtk::TreeModelColumn<bool> read;
Gtk::TreeModelColumn<bool> file;
}; };
Columns _columns; Columns _columns;