(merge from 2.0-ongoing -r1911:1912) fix audio clock handling of key press; fix crash...

[ardour.git] / gtk2_ardour / editor_region_list.cc

diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
index bc95cb0d14c2335be256987af50bbd5217635613..8a50332193400448173cfba7c0b5392dae996abe 100644 (file)
--- a/gtk2_ardour/editor_region_list.cc
+++ b/gtk2_ardour/editor_region_list.cc
@@ -15,24 +15,26 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
 #include <cmath>
 #include <algorithm>
 #include <string>
+#include <sstream>
 
 #include <pbd/basename.h>
 
 #include <ardour/audioregion.h>
 #include <ardour/audiofilesource.h>
+#include <ardour/silentfilesource.h>
 #include <ardour/session_region.h>
 
 #include <gtkmm2ext/stop_signal.h>
 
 #include "editor.h"
 #include "editing.h"
+#include "keyboard.h"
 #include "ardour_ui.h"
 #include "gui_thread.h"
 #include "actions.h"
@@ -50,7 +52,7 @@ using namespace Editing;
 void
 Editor::handle_region_removed (boost::weak_ptr<Region> wregion)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::handle_region_removed), wregion));
+       ENSURE_GUI_THREAD (mem_fun (*this, &Editor::redisplay_regions));
        redisplay_regions ();
 }
 
@@ -85,6 +87,9 @@ Editor::add_region_to_region_display (boost::shared_ptr<Region> region)
        string str;
        TreeModel::Row row;
        Gdk::Color c;
+       bool missing_source;
+
+       missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source());
 
        if (!show_automatic_regions_in_region_list && region->automatic()) {
                return;
@@ -124,18 +129,23 @@ Editor::add_region_to_region_display (boost::shared_ptr<Region> region)
        } else if (region->whole_file()) {
 
                row = *(region_list_model->append());
-               set_color(c, rgba_from_style ("RegionListWholeFile", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false ));
+               if (missing_source) {
+                       c.set_rgb(65535,0,0);     // FIXME: error color from style
+               } else {
+                       set_color(c, rgba_from_style ("RegionListWholeFile", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false ));
+               }
                row[region_list_columns.color_] = c;
 
                if (region->source()->name()[0] == '/') { // external file
 
                        if (region->whole_file()) {
-                               str = ".../";
 
                                boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(region->source());
 
+                               str = ".../";
+
                                if (afs) {
-                                       str += region_name_from_path (afs->path(), region->n_channels() > 1);
+                                       str = region_name_from_path (afs->path(), region->n_channels() > 1);
                                } else {
                                        str += region->source()->name();
                                }
@@ -150,6 +160,18 @@ Editor::add_region_to_region_display (boost::shared_ptr<Region> region)
 
                }
 
+               if (region->n_channels() > 1) {
+                       std::stringstream foo;
+                       foo << region->n_channels ();
+                       str += " [";
+                       str += foo.str();
+                       str += ']';
+               }
+
+               if (missing_source) {
+                       str += _(" (MISSING)");
+               }
+
                row[region_list_columns.name] = str;
                row[region_list_columns.region] = region;
 
@@ -209,12 +231,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);
+                       }
                }
        }
 }
@@ -255,12 +284,6 @@ Editor::redisplay_regions ()
        }
 }
 
-void
-Editor::region_list_clear ()
-{
-       region_list_model->clear();
-}
-
 void
 Editor::build_region_list_menu ()
 {
@@ -548,7 +571,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);
+                       }
                }
        }
 }
@@ -562,6 +594,7 @@ 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);
 }
 
@@ -580,6 +613,7 @@ 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));
 }