added new files

git-svn-id: svn://localhost/ardour2/branches/3.0@7690 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc
new file mode 100644 (file)
index 0000000..6f9ce64
--- /dev/null
+++ b/gtk2_ardour/region_layering_order_editor.cc
@@ -0,0 +1,229 @@
+#include <gtkmm/table.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/alignment.h>
+#include <ardour/region.h>
+
+#include "gui_thread.h"
+#include "i18n.h"
+#include "keyboard.h"
+#include "public_editor.h"
+#include "region_layering_order_editor.h"
+#include "utils.h"
+
+using namespace std;
+using namespace Gtk;
+using namespace ARDOUR;
+
+RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
+       : ArdourDialog (pe, _("RegionLayeringOrderEditor"), false, false)
+       , playlist ()
+       , position ()
+       , in_row_change (false)
+        , regions_at_position (0)
+       , layering_order_columns ()
+       , layering_order_model (Gtk::ListStore::create (layering_order_columns))
+       , layering_order_display ()
+        , clock ("layer dialog", true, "RegionLayeringOrderEditorClock", false, false, false)
+       , scroller ()
+       , editor (pe)
+{
+       set_name ("RegionLayeringOrderEditorWindow");
+
+       layering_order_display.set_model (layering_order_model);
+
+       layering_order_display.append_column (_("Region Name"), layering_order_columns.name);
+       layering_order_display.set_headers_visible (true);
+       layering_order_display.set_reorderable (false);
+       layering_order_display.set_rules_hint (true);
+
+       scroller.set_border_width (10);
+       scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+       scroller.add (layering_order_display);
+
+       clock.set_mode (AudioClock::BBT);
+
+
+        Gtk::Table* scroller_table = manage (new Gtk::Table);
+        scroller_table->set_size_request (300, 250);
+        scroller_table->attach (scroller, 0, 1, 0, 1);
+        scroller_table->set_col_spacings (5);
+        scroller_table->set_row_spacings (5);
+        scroller_table->set_border_width (5);
+  
+        track_label.set_name ("RegionLayeringOrderEditorLabel");
+        track_label.set_text (_("Track:"));
+        clock_label.set_name ("RegionLayeringOrderEditorLabel");
+        clock_label.set_text (_("Position:"));
+        track_name_label.set_name ("RegionLayeringOrderEditorNameLabel");
+        clock.set_mode (AudioClock::BBT);
+  
+        Gtk::Alignment* track_alignment = manage (new Gtk::Alignment);
+        track_alignment->set (1.0, 0.5);
+        track_alignment->add (track_label);
+  
+        Gtk::Alignment* clock_alignment = manage (new Gtk::Alignment);
+        clock_alignment->set (1.0, 0.5);
+        clock_alignment->add (clock_label);
+  
+        Gtk::Table* info_table = manage (new Gtk::Table (2, 2));
+        info_table->set_col_spacings (5);
+        info_table->set_row_spacings (5);
+        info_table->set_border_width (5);
+        info_table->attach (*track_alignment, 0, 1, 0, 1, FILL, FILL);
+        info_table->attach (track_name_label, 1, 2, 0, 1, FILL, FILL);
+        info_table->attach (*clock_alignment, 0, 1, 1, 2, FILL, FILL);
+        info_table->attach (clock, 1, 2, 1, 2, FILL, FILL);
+ 
+        HBox* info_hbox = manage (new HBox);
+ 
+        info_hbox->pack_start (*info_table, true, false);
+ 
+        get_vbox()->set_spacing (5);
+        get_vbox()->pack_start (*info_hbox, false, false);
+        get_vbox()->pack_start (*scroller_table, true, true);
+ 
+        info_table->set_name ("RegionLayeringOrderTable");
+        scroller_table->set_name ("RegionLayeringOrderTable");
+
+       layering_order_display.set_name ("RegionLayeringOrderDisplay");
+
+       layering_order_display.signal_row_activated ().connect (mem_fun (*this, &RegionLayeringOrderEditor::row_activated));
+
+       layering_order_display.grab_focus ();
+
+       set_title (_("Choose Top Region"));
+       show_all();
+}
+
+RegionLayeringOrderEditor::~RegionLayeringOrderEditor ()
+{
+}
+
+void
+RegionLayeringOrderEditor::row_activated (const TreeModel::Path& path, TreeViewColumn* column)
+{
+       if (in_row_change) {
+               return;
+       }
+
+       TreeModel::iterator iter = layering_order_model->get_iter (path);
+
+       if (iter) {
+               TreeModel::Row row = *iter;
+               boost::shared_ptr<Region> region = row[layering_order_columns.region];
+
+               region->raise_to_top ();
+       }
+}
+
+typedef boost::shared_ptr<Region> RegionPtr;
+
+struct RegionCompareByLayer {
+    bool operator() (RegionPtr a, RegionPtr b) const {
+           return a->layer() > b->layer();
+    }
+};
+
+void
+RegionLayeringOrderEditor::refill ()
+{
+       regions_at_position = 0;
+
+       if (!playlist) {
+               return;
+       }
+
+       typedef Playlist::RegionList RegionList;
+
+       in_row_change = true;
+
+       layering_order_model->clear ();
+
+       boost::shared_ptr<RegionList> region_list(playlist->regions_at (position));
+
+       regions_at_position = region_list->size();
+
+       if (regions_at_position < 2) {
+               playlist_modified_connection.disconnect ();
+               hide ();
+               in_row_change = false;
+               return;
+       }
+
+       RegionCompareByLayer cmp;
+       region_list->sort (cmp);
+
+       for (RegionList::const_iterator i = region_list->begin(); i != region_list->end(); ++i) {
+               TreeModel::Row newrow = *(layering_order_model->append());
+               newrow[layering_order_columns.name] = (*i)->name();
+               newrow[layering_order_columns.region] = *i;
+
+               if (i == region_list->begin()) {
+                       layering_order_display.get_selection()->select(newrow);
+               }
+       }
+
+       in_row_change = false;
+}
+
+void
+RegionLayeringOrderEditor::set_context (const string& a_name, Session* s, const boost::shared_ptr<Playlist>  & pl, framepos_t pos)
+{
+        track_name_label.set_text (a_name);
+
+       clock.set_session (s);
+       clock.set (pos, true, 0, 0);
+
+       playlist_modified_connection.disconnect ();
+       playlist = pl;
+       playlist->ContentsChanged.connect (playlist_modified_connection, invalidator (*this), boost::bind
+                                           (&RegionLayeringOrderEditor::playlist_modified, this), gui_context());
+
+       position = pos;
+       refill ();
+}
+
+bool
+RegionLayeringOrderEditor::on_key_press_event (GdkEventKey* ev)
+{
+       bool handled = false;
+
+       /* in general, we want shortcuts working while in this
+          dialog. However, we'd like to treat "return" specially
+          since it is used for row activation. So ..
+
+          for return: try normal handling first
+          then try the editor (to get accelerators/shortcuts)
+          then try normal handling (for keys other than return)
+       */
+
+       if (ev->keyval == GDK_Return) {
+               handled = ArdourDialog::on_key_press_event (ev);
+       }
+       
+       if (!handled) {
+               handled = key_press_focus_accelerator_handler (editor, ev);
+       }
+
+       if (!handled) {
+               handled = ArdourDialog::on_key_press_event (ev);
+       }
+       
+       return handled;
+}
+       
+void
+RegionLayeringOrderEditor::maybe_present ()
+{
+       if (regions_at_position < 2) {
+               hide ();
+               return;
+       }
+       present ();
+}
+
+void
+RegionLayeringOrderEditor::playlist_modified ()
+{
+       refill ();
+}

diff --git a/gtk2_ardour/region_layering_order_editor.h b/gtk2_ardour/region_layering_order_editor.h
new file mode 100644 (file)
index 0000000..10bcd98
--- /dev/null
+++ b/gtk2_ardour/region_layering_order_editor.h
@@ -0,0 +1,64 @@
+#ifndef __gtk2_ardour_region_layering_order_editor_h__
+#define __gtk2_ardour_region_layering_order_editor_h__
+
+#include <gtkmm/dialog.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treeview.h>
+#include <gtkmm/scrolledwindow.h>
+
+#include <ardour/region.h>
+#include <ardour/playlist.h>
+
+#include "ardour_dialog.h"
+#include "audio_clock.h"
+
+class PublicEditor;
+
+namespace ARDOUR {
+       class Session;
+}
+
+class RegionLayeringOrderEditor : public ArdourDialog
+{
+  public:
+       RegionLayeringOrderEditor (PublicEditor&);
+       virtual ~RegionLayeringOrderEditor ();
+       
+       void set_context(const std::string& name, ARDOUR::Session* s, const boost::shared_ptr<ARDOUR::Playlist>  & pl, ARDOUR::framepos_t position);
+       void maybe_present ();
+       
+  protected:
+       virtual bool on_key_press_event (GdkEventKey* event);
+
+  private:
+       boost::shared_ptr<ARDOUR::Playlist> playlist;
+       nframes64_t position;
+       bool in_row_change;
+       uint32_t regions_at_position;
+       
+        PBD::ScopedConnection playlist_modified_connection;
+
+       struct LayeringOrderColumns : public Gtk::TreeModel::ColumnRecord {
+               LayeringOrderColumns () {
+                       add (name);
+                       add (region);
+               }
+               Gtk::TreeModelColumn<std::string> name;
+               Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Region> > region;
+       };
+       LayeringOrderColumns layering_order_columns;
+       Glib::RefPtr<Gtk::ListStore> layering_order_model;
+       Gtk::TreeView layering_order_display;
+       AudioClock clock;
+       Gtk::Label track_label;
+       Gtk::Label track_name_label;
+       Gtk::Label clock_label;
+       Gtk::ScrolledWindow scroller;   // Available layers
+       PublicEditor& editor;
+
+       void row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
+       void refill ();
+       void playlist_modified ();
+};
+
+#endif /* __gtk2_ardour_region_layering_order_editor_h__ */