correct check for presence of / or \ in a session name
[ardour.git] / gtk2_ardour / editor_region_list.cc
index 30b233210f9966160281c585c6a647ff11263ce4..0e14391895fd78c3b8add627634b36095cb13366 100644 (file)
@@ -21,6 +21,7 @@
 #include <cmath>
 #include <algorithm>
 #include <string>
+#include <sstream>
 
 #include <pbd/basename.h>
 
@@ -28,6 +29,7 @@
 #include <ardour/audiofilesource.h>
 #include <ardour/silentfilesource.h>
 #include <ardour/session_region.h>
+#include <ardour/profile.h>
 
 #include <gtkmm2ext/stop_signal.h>
 
@@ -37,6 +39,7 @@
 #include "ardour_ui.h"
 #include "gui_thread.h"
 #include "actions.h"
+#include "region_view.h"
 #include "utils.h"
 
 #include "i18n.h"
@@ -56,20 +59,10 @@ Editor::handle_audio_region_removed (boost::weak_ptr<AudioRegion> wregion)
 }
 
 void
-Editor::handle_new_audio_region (boost::weak_ptr<AudioRegion> wregion)
+Editor::handle_new_audio_regions (vector<boost::weak_ptr<AudioRegion> >& v)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::handle_new_audio_region), wregion));
-
-       /* don't copy region - the one we are being notified
-          about belongs to the session, and so it will
-          never be edited.
-       */
-
-       boost::shared_ptr<AudioRegion> region (wregion.lock());
-       
-       if (region) {
-               add_audio_region_to_region_display (region);
-       }
+       ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::handle_new_audio_regions), v));
+       add_audio_regions_to_region_display (v);
 }
 
 void
@@ -80,6 +73,19 @@ Editor::region_hidden (boost::shared_ptr<Region> r)
        redisplay_regions ();
 }
 
+void
+Editor::add_audio_regions_to_region_display (vector<boost::weak_ptr<AudioRegion> >& regions)
+{
+       region_list_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+       for (vector<boost::weak_ptr<AudioRegion> >::iterator x = regions.begin(); x != regions.end(); ++x) {
+               boost::shared_ptr<AudioRegion> region ((*x).lock());
+               if (region) {
+                       add_audio_region_to_region_display (region);
+               }
+       }
+       region_list_display.set_model (region_list_model);
+}
+
 void
 Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> region)
 {
@@ -100,13 +106,11 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio
                TreeModel::Row parent;
                TreeModel::Row child;
 
-               if (iter == region_list_model->children().end()) {
-                       
+               if (!iter) {
+
                        parent = *(region_list_model->append());
                        
                        parent[region_list_columns.name] = _("Hidden");
-                       boost::shared_ptr<Region> proxy = parent[region_list_columns.region];
-                       proxy.reset ();
 
                } else {
 
@@ -114,19 +118,29 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio
 
                                parent = *(region_list_model->insert(iter));
                                parent[region_list_columns.name] = _("Hidden");
-                               boost::shared_ptr<Region> proxy = parent[region_list_columns.region];
-                               proxy.reset ();
 
                        } else {
+
                                parent = *iter;
                        }
-
                }
 
                row = *(region_list_model->append (parent.children()));
 
        } else if (region->whole_file()) {
 
+               TreeModel::iterator i;
+               TreeModel::Children rows = region_list_model->children();
+
+               for (i = rows.begin(); i != rows.end(); ++i) {
+                       
+                       boost::shared_ptr<Region> rr = (*i)[region_list_columns.region];
+                       
+                       if (rr && region->region_list_equivalent (rr)) {
+                               return;
+                       }
+               }
+
                row = *(region_list_model->append());
                if (missing_source) {
                        c.set_rgb(65535,0,0);     // FIXME: error color from style
@@ -137,20 +151,11 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio
 
                if (region->source()->name()[0] == '/') { // external file
 
-                       if (region->whole_file()) {
-                               str = ".../";
-
-                               boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(region->source());
-
-                               if (afs) {
-                                       str += region_name_from_path (afs->path(), region->n_channels() > 1);
-                               } else {
-                                       str += region->source()->name();
-                               }
+                       /* XXX there was old code here to try to show an abbreviated version
+                          of the path name for whole file regions.
+                       */
 
-                       } else {
-                               str = region->name();
-                       }
+                       str = region->name();
 
                } else {
 
@@ -158,8 +163,16 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio
 
                }
 
+               if (region->n_channels() > 1) {
+                       std::stringstream foo;
+                       foo << region->n_channels ();
+                       str += " [";
+                       str += foo.str();
+                       str += ']';
+               }
+
                if (missing_source) {
-                       str += " (MISSING)";
+                       str += _(" (MISSING)");
                }
 
                row[region_list_columns.name] = str;
@@ -187,6 +200,18 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio
                                        break;
                                }
                        }
+
+                       TreeModel::iterator ii;
+                       TreeModel::Children subrows = (*i).children();
+
+                       for (ii = subrows.begin(); ii != subrows.end(); ++ii) {
+                               
+                               boost::shared_ptr<Region> rrr = (*ii)[region_list_columns.region];
+
+                               if (region->region_list_equivalent (rrr)) {
+                                       return;
+                               }
+                       }
                }
 
                if (!found_parent) {
@@ -221,12 +246,19 @@ Editor::region_list_selection_changed()
                TreeView::Selection::ListHandle_Path::iterator i = rows.begin();
                TreeIter iter;
 
-               /* just set the first selected region (in fact, the selection model might be SINGLE, which
-                  means there can only be one.
-               */
-               
                if ((iter = region_list_model->get_iter (*i))) {
-                       set_selected_regionview_from_region_list (((*iter)[region_list_columns.region]), Selection::Set);
+                       boost::shared_ptr<Region> r = (*iter)[region_list_columns.region];
+                       
+                       /* they could have clicked on a row that is just a placeholder, like "Hidden" */
+                       
+                       if (r) {
+                               
+                               /* just set the first selected region (in fact, the selection model might be SINGLE, which
+                                  means there can only be one.
+                               */
+                               
+                               set_selected_regionview_from_region_list (r, Selection::Set);
+                       }
                }
        }
 }
@@ -246,6 +278,10 @@ Editor::insert_into_tmp_audio_regionlist(boost::shared_ptr<AudioRegion> region)
 void
 Editor::redisplay_regions ()
 {
+       if (no_region_list_redisplay) {
+               return;
+       }
+               
        if (session) {
 
                region_list_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
@@ -362,29 +398,12 @@ Editor::region_list_display_button_press (GdkEventButton *ev)
                return true;
        }
 
-       if (region == 0) {
-               return false;
-       }
-
-       switch (ev->button) {
-       case 1:
-               /* audition on double click */
-               if (ev->type == GDK_2BUTTON_PRESS) {
-                       consider_auditioning (region);
-                       return true;
-               }
-               return false;
-               break;
-
-       case 2:
-               if (!Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
+       if (region != 0 && Keyboard::is_button2_event (ev)) {
+               // start/stop audition 
+               if (!Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                        consider_auditioning (region);
                }
                return true;
-               break;
-
-       default:
-               break; 
        }
 
        return false;
@@ -429,7 +448,7 @@ Editor::consider_auditioning (boost::shared_ptr<Region> region)
                if (r == last_audition_region) {
                        return;
                }
-       }
+       } 
 
        session->audition_region (r);
        last_audition_region = r;
@@ -554,7 +573,16 @@ Editor::region_list_selection_mapover (slot<void,boost::shared_ptr<Region> > sl)
                TreeIter iter;
 
                if ((iter = region_list_model->get_iter (*i))) {
-                       sl (((*iter)[region_list_columns.region]));
+
+                       /* some rows don't have a region associated with them, but can still be
+                          selected (XXX maybe prevent them from being selected)
+                       */
+
+                       boost::shared_ptr<Region> r = (*iter)[region_list_columns.region];
+
+                       if (r) {
+                               sl (r);
+                       }
                }
        }
 }
@@ -568,7 +596,6 @@ Editor::hide_a_region (boost::shared_ptr<Region> r)
 void
 Editor::remove_a_region (boost::shared_ptr<Region> r)
 {
-       cerr << "remove " << r->name();
        session->remove_region_from_region_list (r);
 }
 
@@ -587,7 +614,6 @@ Editor::hide_region_from_region_list ()
 void
 Editor::remove_region_from_region_list ()
 {
-       cerr << "Mapping remove over region selection\n";
        region_list_selection_mapover (mem_fun (*this, &Editor::remove_a_region));
 }
 
@@ -599,9 +625,18 @@ Editor::region_list_display_drag_data_received (const RefPtr<Gdk::DragContext>&
 {
        vector<ustring> paths;
 
+       if (data.get_target() == "GTK_TREE_MODEL_ROW") {
+               region_list_display.on_drag_data_received (context, x, y, data, info, time);
+               return;
+       }
+
        if (convert_drop_to_paths (paths, context, x, y, data, info, time) == 0) {
-               nframes_t pos = 0;
-               do_embed (paths, false, ImportAsRegion, 0, pos, true);
+               nframes64_t pos = 0;
+               if (Profile->get_sae() || Config->get_only_copy_imported_files()) {
+                       do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, SrcBest, pos); 
+               } else {
+                       do_embed (paths, Editing::ImportDistinctFiles, ImportAsRegion, pos);
+               }
                context->drag_finish (true, false, time);
        }
 }
@@ -610,8 +645,42 @@ bool
 Editor::region_list_selection_filter (const RefPtr<TreeModel>& model, const TreeModel::Path& path, bool yn)
 {
        /* not possible to select rows that do not represent regions, like "Hidden" */
+       
+       TreeModel::iterator iter = model->get_iter (path);
+
+       if (iter) {
+               boost::shared_ptr<Region> r =(*iter)[region_list_columns.region];
+               if (!r) {
+                       return false;
+               }
+       } 
 
-       /// XXXX FIXME boost::shared_ptr<Region> r = ((model->get_iter (path)))[region_list_columns.region];
-       /// return r != 0;
        return true;
 }
+
+void
+Editor::region_name_edit (const Glib::ustring& path, const Glib::ustring& new_text)
+{
+       boost::shared_ptr<Region> region;
+       TreeIter iter;
+       
+       if ((iter = region_list_model->get_iter (path))) {
+               region = (*iter)[region_list_columns.region];
+               (*iter)[region_list_columns.name] = new_text;
+       }
+       
+       /* now mapover everything */
+
+       if (region) {
+               vector<RegionView*> equivalents;
+               get_regions_corresponding_to (region, equivalents);
+
+               for (vector<RegionView*>::iterator i = equivalents.begin(); i != equivalents.end(); ++i) {
+                       if (new_text != (*i)->region()->name()) {
+                               (*i)->region()->set_name (new_text);
+                       }
+               }
+       }
+
+}
+