summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/ardour3_ui_dark.rc.in41
-rw-r--r--gtk2_ardour/ardour_ui.cc5
-rw-r--r--gtk2_ardour/icons/fader_belt_h_thin.pngbin0 -> 1429 bytes
-rw-r--r--gtk2_ardour/marker.cc2
-rw-r--r--gtk2_ardour/processor_box.cc533
-rw-r--r--gtk2_ardour/processor_box.h92
-rw-r--r--gtk2_ardour/time_axis_view_item.cc4
-rw-r--r--gtk2_ardour/utils.cc6
-rw-r--r--gtk2_ardour/utils.h3
-rw-r--r--libs/ardour/audio_diskstream.cc7
-rw-r--r--libs/ardour/audio_track.cc5
-rw-r--r--libs/ardour/audiofilesource.cc5
-rw-r--r--libs/ardour/audiosource.cc2
-rw-r--r--libs/ardour/diskstream.cc2
-rw-r--r--libs/ardour/file_source.cc4
-rw-r--r--libs/ardour/region.cc2
-rw-r--r--libs/ardour/send.cc1
-rw-r--r--libs/ardour/session.cc85
-rw-r--r--libs/ardour/session_state.cc8
-rw-r--r--libs/ardour/source.cc2
-rw-r--r--libs/ardour/source_factory.cc43
-rw-r--r--libs/gtkmm2ext/gtkmm2ext/dndvbox.h322
22 files changed, 765 insertions, 409 deletions
diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index 7b2bdde106..b375f30b44 100644
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -1030,30 +1030,30 @@ style "inspector_track_list_display" = "track_list_display"
base[SELECTED] = { 0.3, 0.3, 0.4 }
}
-style "redirect_list_display"
+style "processor_list_display"
{
- GtkTreeView::horizontal-separator = 0
- GtkTreeView::vertical-separator = 0
+ # font_name = "@FONT_SMALL@"
+ # text[NORMAL] = { 0.80, 0.80, 0.80 }
+ # text[ACTIVE] = { 0.70, 0.70, 0.70 }
+ # text[INSENSITIVE] = { 0, 0, 0 }
+ # text[SELECTED] = { 0.9, 0.3, 0.3 }
- font_name = "@FONT_SMALL@"
- text[NORMAL] = { 0.80, 0.80, 0.80 }
- text[ACTIVE] = { 0.70, 0.70, 0.70 }
- text[INSENSITIVE] = { 0, 0, 0 }
- text[SELECTED] = { 0.9, 0.3, 0.3 }
+ # base[NORMAL] = { 0, 0, 0 }
+ # base[ACTIVE] = { 0, 0, 0 }
+ # base[INSENSITIVE] = { 0, 0, 0 }
+ # base[SELECTED] = { 0, 0, 0 }
- base[NORMAL] = { 0, 0, 0 }
- base[ACTIVE] = { 0, 0, 0 }
- base[INSENSITIVE] = { 0, 0, 0 }
- base[SELECTED] = { 0, 0, 0 }
+ # # these two are explicitly used by the cell renderer for the
+ # # text
- # these two are explicitly used by the cell renderer for the
- # text
+ # fg[NORMAL] = { 0.5, 0.5, 0.5 } # used for inactive
+ # fg[ACTIVE] = { 1.0, 1.0, 1.0 } # used for active
- fg[NORMAL] = { 0.5, 0.5, 0.5 } # used for inactive
- fg[ACTIVE] = { 1.0, 1.0, 1.0 } # used for active
+ font_name = "@FONT_SMALL@"
+ bg[NORMAL] = { 0, 0, 0 }
}
-style "inspector_redirect_list_display" = "redirect_list_display"
+style "inspector_processor_list_display" = "processor_list_display"
{
base[SELECTED] = { 0.3, 0.3, 0.3 }
}
@@ -1523,8 +1523,6 @@ widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
widget "*PluginUIClickBox" style:highest "medium_bold_entry"
widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
widget "*PluginSlider" style:highest "plugin_slider"
-widget "*RedirectSelector" style:highest "redirect_list_display"
-widget "*RedirectSelector.*" style:highest "redirect_list_display"
widget "*EditGroupDisplay" style:highest "treeview_display"
widget "*TrackListDisplay" style:highest "treeview_display"
widget "*RegionListDisplay" style:highest "treeview_display"
@@ -1588,8 +1586,8 @@ widget "*ConnectionEditorNotebook" style:highest "io_selector_notebook"
widget "*ConnectionEditorNotebookTab" style:highest "io_selector_notebook"
widget "*ConnectionEditorFrame" style:highest "base_frame"
widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
-widget "*RouteParamsPreListDisplay" style:highest "inspector_redirect_list_display"
-widget "*RouteParamsPostListDisplay" style:highest "inspector_redirect_list_display"
+widget "*RouteParamsPreListDisplay" style:highest "inspector_processor_list_display"
+widget "*RouteParamsPostListDisplay" style:highest "inspector_processor_list_display"
widget "*TearOffArrow" style:highest "tearoff_arrow"
widget "*RouteParamsTitleButton" style:highest "medium_text"
widget "*RouteParamsTitleLabel" style:highest "medium_text"
@@ -1668,3 +1666,4 @@ widget "*EditorHScrollbar" style:highest "editor_hscrollbar"
widget "*OddPortGroups" style:highest "odd_port_groups"
widget "*EvenPortGroups" style:highest "even_port_groups"
widget "*MidiListView*" style:highest "white_tree_view"
+widget "*ProcessorSelector*" style:highest "processor_list_display"
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 4ca94f1cd4..343d933699 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -95,6 +95,7 @@ typedef uint64_t microseconds_t;
#include "route_time_axis.h"
#include "startup.h"
#include "engine_dialog.h"
+#include "processor_box.h"
#include "i18n.h"
@@ -262,6 +263,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
GainMeter::setup_slider_pix ();
RouteTimeAxisView::setup_slider_pix ();
+ SendProcessorEntry::setup_slider_pix ();
} catch (failed_constructor& err) {
error << _("could not initialize Ardour.") << endmsg;
@@ -773,7 +775,8 @@ If you still wish to quit, please use the\n\n\
}
}
- session->set_deletion_in_progress ();
+ // session->set_deletion_in_progress ();
+ delete session;
}
ArdourDialog::close_all_dialogs ();
diff --git a/gtk2_ardour/icons/fader_belt_h_thin.png b/gtk2_ardour/icons/fader_belt_h_thin.png
new file mode 100644
index 0000000000..b3dec4b6c4
--- /dev/null
+++ b/gtk2_ardour/icons/fader_belt_h_thin.png
Binary files differ
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 75a96ef5a4..bc1ec7fc13 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -358,7 +358,7 @@ Marker::set_name (const string& new_name)
{
int name_width = pixel_width (new_name, *name_font) + 2;
- name_pixbuf->property_pixbuf() = pixbuf_from_ustring(new_name, name_font, name_width, name_height);
+ name_pixbuf->property_pixbuf() = pixbuf_from_ustring(new_name, name_font, name_width, name_height, Gdk::Color ("#000000"));
if (_type == End || _type == LoopEnd || _type == PunchOut) {
name_pixbuf->property_x() = - (name_width);
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 964ed9510c..5e95b92870 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -89,9 +89,182 @@ using namespace Gtkmm2ext;
ProcessorBox* ProcessorBox::_current_processor_box = 0;
RefPtr<Action> ProcessorBox::paste_action;
-bool ProcessorBox::get_colors = true;
-Gdk::Color* ProcessorBox::active_processor_color;
-Gdk::Color* ProcessorBox::inactive_processor_color;
+Glib::RefPtr<Gdk::Pixbuf> SendProcessorEntry::_slider;
+
+ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
+ : _processor (p), _width (w)
+{
+ _hbox.pack_start (_active, false, false);
+ _event_box.add (_name);
+ _hbox.pack_start (_event_box, true, true);
+ _vbox.pack_start (_hbox);
+
+ _name.set_alignment (0, 0.5);
+ _name.set_text (name ());
+ _name.set_padding (2, 2);
+
+ _active.set_active (_processor->active ());
+ _active.signal_toggled().connect (mem_fun (*this, &ProcessorEntry::active_toggled));
+
+ _processor->ActiveChanged.connect (mem_fun (*this, &ProcessorEntry::processor_active_changed));
+ _processor->NameChanged.connect (mem_fun (*this, &ProcessorEntry::processor_name_changed));
+}
+
+EventBox&
+ProcessorEntry::action_widget ()
+{
+ return _event_box;
+}
+
+Gtk::Widget&
+ProcessorEntry::widget ()
+{
+ return _vbox;
+}
+
+string
+ProcessorEntry::drag_text () const
+{
+ return name ();
+}
+
+boost::shared_ptr<Processor>
+ProcessorEntry::processor () const
+{
+ return _processor;
+}
+
+void
+ProcessorEntry::set_width (Width w)
+{
+ _width = w;
+}
+
+void
+ProcessorEntry::active_toggled ()
+{
+ if (_active.get_active ()) {
+ if (!_processor->active ()) {
+ _processor->activate ();
+ }
+ } else {
+ if (_processor->active ()) {
+ _processor->deactivate ();
+ }
+ }
+}
+
+void
+ProcessorEntry::processor_active_changed ()
+{
+ if (_active.get_active () != _processor->active ()) {
+ _active.set_active (_processor->active ());
+ }
+}
+
+void
+ProcessorEntry::processor_name_changed ()
+{
+ _name.set_text (name ());
+}
+
+string
+ProcessorEntry::name () const
+{
+ boost::shared_ptr<Send> send;
+ string name_display;
+
+ if (!_processor->active()) {
+ name_display = " (";
+ }
+
+ if ((send = boost::dynamic_pointer_cast<Send> (_processor)) != 0 &&
+ !boost::dynamic_pointer_cast<InternalSend>(_processor)) {
+
+ name_display += '>';
+
+ /* grab the send name out of its overall name */
+
+ string::size_type lbracket, rbracket;
+ lbracket = send->name().find ('[');
+ rbracket = send->name().find (']');
+
+ switch (_width) {
+ case Wide:
+ name_display += send->name().substr (lbracket+1, lbracket-rbracket-1);
+ break;
+ case Narrow:
+ name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4);
+ break;
+ }
+
+ } else {
+
+ switch (_width) {
+ case Wide:
+ name_display += _processor->display_name();
+ break;
+ case Narrow:
+ name_display += PBD::short_version (_processor->display_name(), 5);
+ break;
+ }
+
+ }
+
+ if (!_processor->active()) {
+ name_display += ')';
+ }
+
+ return name_display;
+}
+
+SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
+ : ProcessorEntry (s, w),
+ _send (s),
+ _adjustment (0, 0, 1, 0.01, 0.1),
+ _fader (_slider, &_adjustment, false),
+ _ignore_gain_change (false)
+{
+ _fader.set_controllable (_send->amp()->gain_control ());
+ _vbox.pack_start (_fader);
+
+ _adjustment.signal_value_changed().connect (mem_fun (*this, &SendProcessorEntry::gain_adjusted));
+ _send->amp()->gain_control()->Changed.connect (mem_fun (*this, &SendProcessorEntry::show_gain));
+ show_gain ();
+}
+
+void
+SendProcessorEntry::setup_slider_pix ()
+{
+ _slider = ::get_icon ("fader_belt_h_thin");
+ assert (_slider);
+}
+
+void
+SendProcessorEntry::show_gain ()
+{
+ ENSURE_GUI_THREAD (mem_fun (*this, &SendProcessorEntry::show_gain));
+
+ float const value = gain_to_slider_position (_send->amp()->gain ());
+
+ if (_adjustment.get_value() != value) {
+ _ignore_gain_change = true;
+ _adjustment.set_value (value);
+ _ignore_gain_change = false;
+ }
+}
+
+void
+SendProcessorEntry::gain_adjusted ()
+{
+ if (_ignore_gain_change) {
+ return;
+ }
+
+ _send->amp()->set_gain (slider_position_to_gain (_adjustment.get_value()), this);
+}
+
+
ProcessorBox::ProcessorBox (ARDOUR::Session& sess, sigc::slot<PluginSelector*> get_plugin_selector,
RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer)
@@ -102,57 +275,19 @@ ProcessorBox::ProcessorBox (ARDOUR::Session& sess, sigc::slot<PluginSelector*> g
, _placement(PreFader)
, _rr_selection(rsel)
{
- if (get_colors) {
- active_processor_color = new Gdk::Color;
- inactive_processor_color = new Gdk::Color;
- set_color (*active_processor_color, rgba_from_style (
- "ProcessorSelector", 0xff, 0, 0, 0, "fg", Gtk::STATE_ACTIVE, false ));
- set_color (*inactive_processor_color, rgba_from_style (
- "ProcessorSelector", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false ));
- get_colors = false;
- }
-
_width = Wide;
processor_menu = 0;
send_action_menu = 0;
- processor_drag_in_progress = false;
no_processor_redisplay = false;
- ignore_delete = false;
-
- model = ListStore::create(columns);
-
- RefPtr<TreeSelection> selection = processor_display.get_selection();
- selection->set_mode (Gtk::SELECTION_MULTIPLE);
- selection->signal_changed().connect (mem_fun (*this, &ProcessorBox::selection_changed));
-
- processor_display.set_data ("processorbox", this);
- processor_display.set_model (model);
- processor_display.append_column (X_("notshown"), columns.text);
- processor_display.set_name ("ProcessorSelector");
- processor_display.set_headers_visible (false);
- processor_display.set_reorderable (true);
- processor_display.set_size_request (-1, 40);
- processor_display.get_column(0)->set_sizing(TREE_VIEW_COLUMN_FIXED);
- processor_display.get_column(0)->set_fixed_width(48);
- processor_display.add_object_drag (columns.processor.index(), "processors");
- processor_display.set_enable_search (false);
- processor_display.signal_drop.connect (mem_fun (*this, &ProcessorBox::object_drop));
-
- TreeViewColumn* name_col = processor_display.get_column(0);
- CellRendererText* renderer = dynamic_cast<CellRendererText*>(
- processor_display.get_column_cell_renderer (0));
- name_col->add_attribute(renderer->property_foreground_gdk(), columns.color);
processor_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-
- model->signal_row_deleted().connect (mem_fun (*this, &ProcessorBox::row_deleted));
-
processor_scroller.add (processor_display);
- processor_eventbox.add (processor_scroller);
+ pack_start (processor_scroller, true, true);
- processor_scroller.set_size_request (-1, 40);
-
- pack_start (processor_eventbox, true, true);
+ // processor_display.set_can_focus ();
+ processor_display.set_name ("ProcessorSelector");
+ processor_display.set_size_request (48, 40);
+ processor_display.set_data ("processorbox", this);
processor_display.signal_enter_notify_event().connect (mem_fun(*this, &ProcessorBox::enter_notify), false);
processor_display.signal_leave_notify_event().connect (mem_fun(*this, &ProcessorBox::leave_notify), false);
@@ -160,10 +295,12 @@ ProcessorBox::ProcessorBox (ARDOUR::Session& sess, sigc::slot<PluginSelector*> g
processor_display.signal_key_press_event().connect (mem_fun(*this, &ProcessorBox::processor_key_press_event));
processor_display.signal_key_release_event().connect (mem_fun(*this, &ProcessorBox::processor_key_release_event));
- processor_display.signal_button_press_event().connect (
- mem_fun(*this, &ProcessorBox::processor_button_press_event), false);
- processor_display.signal_button_release_event().connect (
- mem_fun(*this, &ProcessorBox::processor_button_release_event));
+ processor_display.ButtonPress.connect (mem_fun (*this, &ProcessorBox::processor_button_press_event));
+ processor_display.ButtonRelease.connect (mem_fun (*this, &ProcessorBox::processor_button_release_event));
+
+ processor_display.Reordered.connect (mem_fun (*this, &ProcessorBox::reordered));
+ processor_display.DropFromAnotherBox.connect (mem_fun (*this, &ProcessorBox::object_drop));
+ processor_display.SelectionChanged.connect (mem_fun (*this, &ProcessorBox::selection_changed));
}
ProcessorBox::~ProcessorBox ()
@@ -196,21 +333,18 @@ ProcessorBox::route_going_away ()
no_processor_redisplay = true;
}
-
void
-ProcessorBox::object_drop (const list<boost::shared_ptr<Processor> >& procs, Gtk::TreeView* source, int x, int y, Glib::RefPtr<Gdk::DragContext>& context)
+ProcessorBox::object_drop(DnDVBox<ProcessorEntry>* source, ProcessorEntry* position, Glib::RefPtr<Gdk::DragContext> const & context)
{
- TreeIter iter;
- TreeModel::Path path;
- TreeViewColumn* column;
- int cellx;
- int celly;
boost::shared_ptr<Processor> p;
+ if (position) {
+ p = position->processor ();
+ }
- if (processor_display.get_path_at_pos (x, y, path, column, cellx, celly)) {
- if ((iter = model->get_iter (path))) {
- p = (*iter)[columns.processor];
- }
+ list<ProcessorEntry*> children = source->selection ();
+ list<boost::shared_ptr<Processor> > procs;
+ for (list<ProcessorEntry*>::const_iterator i = children.begin(); i != children.end(); ++i) {
+ procs.push_back ((*i)->processor ());
}
for (list<boost::shared_ptr<Processor> >::const_iterator i = procs.begin(); i != procs.end(); ++i) {
@@ -221,7 +355,7 @@ ProcessorBox::object_drop (const list<boost::shared_ptr<Processor> >& procs, Gtk
delete &state;
}
- /* since the treeview doesn't take care of this properly, we have to delete the originals
+ /* since the dndvbox doesn't take care of this properly, we have to delete the originals
ourselves.
*/
@@ -232,8 +366,6 @@ ProcessorBox::object_drop (const list<boost::shared_ptr<Processor> >& procs, Gtk
other->delete_dragged_processors (procs);
}
}
-
- context->drag_finish (true, (context->get_suggested_action() == Gdk::ACTION_MOVE), 0);
}
void
@@ -242,15 +374,20 @@ ProcessorBox::update()
redisplay_processors ();
}
-
void
ProcessorBox::set_width (Width w)
{
if (_width == w) {
return;
}
+
_width = w;
+ list<ProcessorEntry*> children = processor_display.children ();
+ for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
+ (*i)->set_width (w);
+ }
+
redisplay_processors ();
}
@@ -353,18 +490,6 @@ ProcessorBox::show_processor_menu (gint arg)
processor_menu->popup (1, arg);
}
-void
-ProcessorBox::processor_drag_begin (GdkDragContext *)
-{
- processor_drag_in_progress = true;
-}
-
-void
-ProcessorBox::processor_drag_end (GdkDragContext *)
-{
- processor_drag_in_progress = false;
-}
-
bool
ProcessorBox::enter_notify (GdkEventCrossing*)
{
@@ -406,18 +531,12 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
if (targets.empty()) {
int x, y;
- TreeIter iter;
- TreeModel::Path path;
- TreeViewColumn* column;
- int cellx;
- int celly;
-
processor_display.get_pointer (x, y);
- if (processor_display.get_path_at_pos (x, y, path, column, cellx, celly)) {
- if ((iter = model->get_iter (path))) {
- targets.push_back ((*iter)[columns.processor]);
- }
+ pair<ProcessorEntry *, int> const pointer = processor_display.get_child_at_position (x, y);
+
+ if (pointer.first) {
+ targets.push_back (pointer.first->processor ());
}
}
@@ -470,24 +589,15 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
}
bool
-ProcessorBox::processor_button_press_event (GdkEventButton *ev)
+ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child)
{
- TreeIter iter;
- TreeModel::Path path;
- TreeViewColumn* column;
- int cellx;
- int celly;
boost::shared_ptr<Processor> processor;
- int ret = false;
- bool selected = false;
-
- if (processor_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
- if ((iter = model->get_iter (path))) {
- processor = (*iter)[columns.processor];
- selected = processor_display.get_selection()->is_selected (iter);
- }
-
+ if (child) {
+ processor = child->processor ();
}
+
+ int ret = false;
+ bool selected = processor_display.selected (child);
if (processor && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS))) {
@@ -508,26 +618,18 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev)
_get_plugin_selector()->show_manager ();
}
-
return ret;
}
bool
-ProcessorBox::processor_button_release_event (GdkEventButton *ev)
+ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry* child)
{
- TreeIter iter;
- TreeModel::Path path;
- TreeViewColumn* column;
- int cellx;
- int celly;
boost::shared_ptr<Processor> processor;
- int ret = false;
-
- if (processor_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
- if ((iter = model->get_iter (path))) {
- processor = (*iter)[columns.processor];
- }
+ if (child) {
+ processor = child->processor ();
}
+
+ int ret = false;
if (processor && Keyboard::is_delete_event (ev)) {
@@ -572,7 +674,7 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev)
}
- return ret;
+ return false;
}
Menu *
@@ -589,20 +691,20 @@ ProcessorBox::build_processor_menu ()
void
ProcessorBox::selection_changed ()
{
- bool sensitive = (processor_display.get_selection()->count_selected_rows()) ? true : false;
+ bool sensitive = (processor_display.selection().empty()) ? false : true;
ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive);
}
void
ProcessorBox::select_all_processors ()
{
- processor_display.get_selection()->select_all();
+ processor_display.select_all ();
}
void
ProcessorBox::deselect_all_processors ()
{
- processor_display.get_selection()->unselect_all();
+ processor_display.select_none ();
}
void
@@ -632,9 +734,6 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
if (Profile->get_sae()) {
processor->activate ();
}
- processor->ActiveChanged.connect (bind (
- mem_fun (*this, &ProcessorBox::show_processor_active),
- boost::weak_ptr<Processor>(processor)));
}
}
}
@@ -685,9 +784,6 @@ void
ProcessorBox::choose_insert ()
{
boost::shared_ptr<Processor> processor (new PortInsert (_session, _route->mute_master()));
- processor->ActiveChanged.connect (bind (mem_fun(*this, &ProcessorBox::show_processor_active),
- boost::weak_ptr<Processor>(processor)));
-
_route->add_processor (processor, _placement);
}
@@ -843,12 +939,7 @@ ProcessorBox::redisplay_processors ()
return;
}
- ignore_delete = true;
- model->clear ();
- ignore_delete = false;
-
- processor_active_connections.clear ();
- processor_name_connections.clear ();
+ processor_display.clear ();
_route->foreach_processor (mem_fun (*this, &ProcessorBox::add_processor_to_display));
@@ -864,147 +955,43 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
return;
}
- Gtk::TreeModel::Row row = *(model->append());
- row[columns.text] = processor_name (processor);
- row[columns.processor] = processor;
-
- show_processor_active (processor);
-
- processor_active_connections.push_back (processor->ActiveChanged.connect (bind (
- mem_fun(*this, &ProcessorBox::show_processor_active),
- boost::weak_ptr<Processor>(processor))));
- processor_name_connections.push_back (processor->NameChanged.connect (bind (
- mem_fun(*this, &ProcessorBox::show_processor_name),
- boost::weak_ptr<Processor>(processor))));
-}
-
-string
-ProcessorBox::processor_name (boost::weak_ptr<Processor> weak_processor)
-{
- boost::shared_ptr<Processor> processor (weak_processor.lock());
-
- if (!processor) {
- return string();
- }
-
- boost::shared_ptr<Send> send;
- string name_display;
-
- if (!processor->active()) {
- name_display = " (";
- }
-
- if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0 &&
- !boost::dynamic_pointer_cast<InternalSend>(processor)) {
-
- name_display += '>';
-
- /* grab the send name out of its overall name */
-
- string::size_type lbracket, rbracket;
- lbracket = send->name().find ('[');
- rbracket = send->name().find (']');
-
- switch (_width) {
- case Wide:
- name_display += send->name().substr (lbracket+1, lbracket-rbracket-1);
- break;
- case Narrow:
- name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4);
- break;
- }
-
+ boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
+ if (send) {
+ processor_display.add_child (new SendProcessorEntry (send, _width));
} else {
-
- switch (_width) {
- case Wide:
- name_display += processor->display_name();
- break;
- case Narrow:
- name_display += PBD::short_version (processor->display_name(), 5);
- break;
- }
-
+ processor_display.add_child (new ProcessorEntry (processor, _width));
}
-
- if (!processor->active()) {
- name_display += ')';
- }
-
- return name_display;
}
+
void
ProcessorBox::build_processor_tooltip (EventBox& box, string start)
{
string tip(start);
- Gtk::TreeModel::Children children = model->children();
- for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
- Gtk::TreeModel::Row row = *iter;
+ list<ProcessorEntry*> children = processor_display.children ();
+ for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
tip += '\n';
- tip += row[columns.text];
+ tip += (*i)->processor()->name();
}
+
ARDOUR_UI::instance()->tooltips().set_tip (box, tip);
}
void
-ProcessorBox::show_processor_name (boost::weak_ptr<Processor> processor)
-{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &ProcessorBox::show_processor_name), processor));
- show_processor_active (processor);
-}
-
-void
-ProcessorBox::show_processor_active (boost::weak_ptr<Processor> weak_processor)
-{
- boost::shared_ptr<Processor> processor (weak_processor.lock());
-
- if (!processor) {
- return;
- }
-
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &ProcessorBox::show_processor_active), weak_processor));
-
- Gtk::TreeModel::Children children = model->children();
- Gtk::TreeModel::Children::iterator iter = children.begin();
-
- while (iter != children.end()) {
-
- boost::shared_ptr<Processor> r = (*iter)[columns.processor];
-
- if (r == processor) {
- (*iter)[columns.text] = processor_name (r);
-
- if (processor->active()) {
- (*iter)[columns.color] = *active_processor_color;
- } else {
- (*iter)[columns.color] = *inactive_processor_color;
- }
- break;
- }
-
- iter++;
- }
-}
-
-void
-ProcessorBox::row_deleted (const Gtk::TreeModel::Path &)
+ProcessorBox::reordered ()
{
- if (!ignore_delete) {
- compute_processor_sort_keys ();
- }
+ compute_processor_sort_keys ();
}
void
ProcessorBox::compute_processor_sort_keys ()
{
- Gtk::TreeModel::Children children = model->children();
+ list<ProcessorEntry*> children = processor_display.children ();
Route::ProcessorList our_processors;
- for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
- boost::shared_ptr<Processor> p = (*iter)[columns.processor];
- our_processors.push_back ((*iter)[columns.processor]);
+ for (list<ProcessorEntry*>::iterator iter = children.begin(); iter != children.end(); ++iter) {
+ our_processors.push_back ((*iter)->processor ());
}
if (_route->reorder_processors (our_processors)) {
@@ -1332,21 +1319,18 @@ ProcessorBox::deactivate_processor (boost::shared_ptr<Processor> r)
void
ProcessorBox::get_selected_processors (ProcSelection& processors)
{
- vector<Gtk::TreeModel::Path> pathlist = processor_display.get_selection()->get_selected_rows();
-
- for (vector<Gtk::TreeModel::Path>::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter) {
- processors.push_back ((*(model->get_iter(*iter)))[columns.processor]);
- }
+ list<ProcessorEntry*> selection = processor_display.selection ();
+ for (list<ProcessorEntry*>::iterator i = selection.begin(); i != selection.end(); ++i) {
+ processors.push_back ((*i)->processor ());
+ }
}
void
ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(boost::shared_ptr<Processor>))
{
- vector<Gtk::TreeModel::Path> pathlist = processor_display.get_selection()->get_selected_rows();
-
- for (vector<Gtk::TreeModel::Path>::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter) {
- boost::shared_ptr<Processor> processor = (*(model->get_iter(*iter)))[columns.processor];
- (this->*method)(processor);
+ list<ProcessorEntry*> selection = processor_display.selection ();
+ for (list<ProcessorEntry*>::iterator i = selection.begin(); i != selection.end(); ++i) {
+ (this->*method) ((*i)->processor ());
}
}
@@ -1575,11 +1559,6 @@ ProcessorBox::register_actions ()
sigc::ptr_fun (ProcessorBox::rb_deselect_all));
/* activation */
- act = ActionManager::register_action (popup_act_grp, X_("activate"), _("Activate"),
- sigc::ptr_fun (ProcessorBox::rb_activate));
- ActionManager::plugin_selection_sensitive_actions.push_back(act);
- act = ActionManager::register_action (popup_act_grp, X_("deactivate"), _("Deactivate"),
- sigc::ptr_fun (ProcessorBox::rb_deactivate));
ActionManager::plugin_selection_sensitive_actions.push_back(act);
ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"),
sigc::ptr_fun (ProcessorBox::rb_activate_all));
@@ -1741,25 +1720,6 @@ ProcessorBox::rb_deselect_all ()
}
void
-ProcessorBox::rb_activate ()
-{
- if (_current_processor_box == 0) {
- return;
- }
-
- _current_processor_box->for_selected_processors (&ProcessorBox::activate_processor);
-}
-
-void
-ProcessorBox::rb_deactivate ()
-{
- if (_current_processor_box == 0) {
- return;
- }
- _current_processor_box->for_selected_processors (&ProcessorBox::deactivate_processor);
-}
-
-void
ProcessorBox::rb_activate_all ()
{
if (_current_processor_box == 0) {
@@ -1797,12 +1757,11 @@ ProcessorBox::route_name_changed ()
boost::shared_ptr<PluginInsert> plugin_insert;
boost::shared_ptr<Send> send;
- Gtk::TreeModel::Children children = model->children();
+ list<ProcessorEntry*> children = processor_display.children();
- for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
- Gtk::TreeModel::Row row = *iter;
+ for (list<ProcessorEntry*>::iterator iter = children.begin(); iter != children.end(); ++iter) {
- processor= row[columns.processor];
+ processor = (*iter)->processor ();
void* gui = processor->get_gui();
diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index cf56299524..6fa11339ff 100644
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -30,7 +30,8 @@
#include <gtkmm2ext/dndtreeview.h>
#include <gtkmm2ext/auto_spin.h>
#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/dndtreeview.h>
+#include <gtkmm2ext/dndvbox.h>
+#include <gtkmm2ext/pixfader.h>
#include "pbd/stateful.h"
@@ -66,6 +67,55 @@ namespace ARDOUR {
class Session;
}
+class ProcessorEntry : public Gtkmm2ext::DnDVBoxChild, public sigc::trackable
+{
+public:
+ ProcessorEntry (boost::shared_ptr<ARDOUR::Processor>, Width);
+
+ Gtk::EventBox& action_widget ();
+ Gtk::Widget& widget ();
+ std::string drag_text () const;
+ boost::shared_ptr<ARDOUR::Processor> processor () const;
+ void set_width (Width);
+
+protected:
+
+ Gtk::VBox _vbox;
+
+private:
+
+ void active_toggled ();
+ void processor_active_changed ();
+ void processor_name_changed ();
+ std::string name () const;
+
+ Gtk::EventBox _event_box;
+ Gtk::Label _name;
+ Gtk::HBox _hbox;
+ Gtk::CheckButton _active;
+ boost::shared_ptr<ARDOUR::Processor> _processor;
+ Width _width;
+};
+
+class SendProcessorEntry : public ProcessorEntry
+{
+public:
+ SendProcessorEntry (boost::shared_ptr<ARDOUR::Send>, Width);
+
+ static void setup_slider_pix ();
+
+private:
+ void show_gain ();
+ void gain_adjusted ();
+
+ boost::shared_ptr<ARDOUR::Send> _send;
+ Gtk::Adjustment _adjustment;
+ Gtkmm2ext::HSliderController _fader;
+ bool _ignore_gain_change;
+
+ static Glib::RefPtr<Gdk::Pixbuf> _slider;
+};
+
class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
{
public:
@@ -107,33 +157,14 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
void route_going_away ();
- struct ModelColumns : public Gtk::TreeModel::ColumnRecord {
- ModelColumns () {
- add (text);
- add (processor);
- add (color);
- }
- Gtk::TreeModelColumn<std::string> text;
- Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Processor> > processor;
- Gtk::TreeModelColumn<Gdk::Color> color;
- };
-
- ModelColumns columns;
- Glib::RefPtr<Gtk::ListStore> model;
-
void selection_changed ();
- static bool get_colors;
- static Gdk::Color* active_processor_color;
- static Gdk::Color* inactive_processor_color;
-
Gtk::EventBox processor_eventbox;
Gtk::HBox processor_hpacker;
- Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Processor> > processor_display;
+ Gtkmm2ext::DnDVBox<ProcessorEntry> processor_display;
Gtk::ScrolledWindow processor_scroller;
- void object_drop (const std::list<boost::shared_ptr<ARDOUR::Processor> >&, Gtk::TreeView*,
- int x, int y, Glib::RefPtr<Gdk::DragContext>& context);
+ void object_drop (Gtkmm2ext::DnDVBox<ProcessorEntry> *, ProcessorEntry *, Glib::RefPtr<Gdk::DragContext> const &);
Width _width;
@@ -160,31 +191,22 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
void use_plugins (const SelectedPlugins&);
bool no_processor_redisplay;
- bool ignore_delete;
bool enter_notify (GdkEventCrossing *ev);
bool leave_notify (GdkEventCrossing *ev);
bool processor_key_press_event (GdkEventKey *);
bool processor_key_release_event (GdkEventKey *);
- bool processor_button_press_event (GdkEventButton *);
- bool processor_button_release_event (GdkEventButton *);
+ bool processor_button_press_event (GdkEventButton *, ProcessorEntry *);
+ bool processor_button_release_event (GdkEventButton *, ProcessorEntry *);
void redisplay_processors ();
void add_processor_to_display (boost::weak_ptr<ARDOUR::Processor>);
- void row_deleted (const Gtk::TreeModel::Path& path);
- void show_processor_active (boost::weak_ptr<ARDOUR::Processor>);
- void show_processor_name (boost::weak_ptr<ARDOUR::Processor>);
- std::string processor_name (boost::weak_ptr<ARDOUR::Processor>);
+ void reordered ();
void remove_processor_gui (boost::shared_ptr<ARDOUR::Processor>);
void processors_reordered (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&, int*);
void compute_processor_sort_keys ();
- std::vector<sigc::connection> processor_active_connections;
- std::vector<sigc::connection> processor_name_connections;
- bool processor_drag_in_progress;
- void processor_drag_begin (GdkDragContext*);
- void processor_drag_end (GdkDragContext*);
void all_processors_active(bool state);
void all_plugins_active(bool state);
void ab_plugins ();
@@ -238,8 +260,6 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
static void rb_rename ();
static void rb_select_all ();
static void rb_deselect_all ();
- static void rb_activate ();
- static void rb_deactivate ();
static void rb_activate_all ();
static void rb_deactivate_all ();
static void rb_ab_plugins ();
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 1d8fc2aca7..32c7402017 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -535,7 +535,7 @@ TimeAxisViewItem::set_name_text(const ustring& new_name)
last_item_width = trackview.editor().frame_to_pixel(item_duration);
name_pixbuf_width = pixel_width (new_name, *NAME_FONT) + 2;
- name_pixbuf->property_pixbuf() = pixbuf_from_ustring(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT);
+ name_pixbuf->property_pixbuf() = pixbuf_from_ustring(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000"));
}
@@ -902,7 +902,7 @@ TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
name_pixbuf->show();
}
- name_pixbuf->property_pixbuf() = pixbuf_from_ustring(item_name, NAME_FONT, pb_width, NAME_HEIGHT);
+ name_pixbuf->property_pixbuf() = pixbuf_from_ustring(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000"));
}
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index e50a39b397..257f68d4df 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -982,7 +982,7 @@ resize_window_to_proportion_of_monitor (Gtk::Window* window, int max_width, int
}
Glib::RefPtr<Gdk::Pixbuf>
-pixbuf_from_ustring(const ustring& name, Pango::FontDescription* font, int clip_width, int clip_height)
+pixbuf_from_ustring(const ustring& name, Pango::FontDescription* font, int clip_width, int clip_height, Gdk::Color fg)
{
static Glib::RefPtr<Gdk::Pixbuf>* empty_pixbuf = 0;
@@ -1001,10 +1001,10 @@ pixbuf_from_ustring(const ustring& name, Pango::FontDescription* font, int clip_
cairo_t* cr = cairo_create (surface);
cairo_text_extents_t te;
- cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
+ cairo_set_source_rgba (cr, fg.get_red_p(), fg.get_green_p(), fg.get_blue_p(), 1.0);
cairo_select_font_face (cr, font->get_family().c_str(),
CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
- cairo_set_font_size (cr, font->get_size() / Pango::SCALE);
+ cairo_set_font_size (cr, font->get_size());// / Pango::SCALE);
cairo_text_extents (cr, name.c_str(), &te);
cairo_move_to (cr, 0.5, 0.5 - te.height / 2 - te.y_bearing + clip_height / 2);
diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index a7da5cc997..90a6de9ec4 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -106,7 +106,8 @@ void convert_bgra_to_rgba (guint8 const* src,
Glib::RefPtr<Gdk::Pixbuf> pixbuf_from_ustring (const Glib::ustring& name,
Pango::FontDescription* font,
int clip_width,
- int clip_height);
+ int clip_height,
+ Gdk::Color);
void resize_window_to_proportion_of_monitor (Gtk::Window*, int, int);
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 3248cd9b2d..faa4684745 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -122,6 +122,8 @@ AudioDiskstream::init (Diskstream::Flag f)
AudioDiskstream::~AudioDiskstream ()
{
+ cerr << "AD going away\n";
+
notify_callbacks ();
{
@@ -1915,6 +1917,11 @@ AudioDiskstream::use_new_write_source (uint32_t n)
/* do not remove destructive files even if they are empty */
chan->write_source->set_allow_remove_if_empty (!destructive());
+
+ /* until we write, this file is considered removable */
+
+ chan->write_source->mark_for_remove ();
+ cerr << "New write source " << chan->write_source->path() << " flags " << enum_2_string (chan->write_source->flags()) << endl;
return 0;
}
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index e2101479fe..1a92cd5459 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -23,6 +23,7 @@
#include "pbd/error.h"
#include "pbd/enumwriter.h"
+#include "pbd/boost_debug.h"
#include "evoral/Curve.hpp"
@@ -83,8 +84,8 @@ AudioTrack::use_new_diskstream ()
dflags = AudioDiskstream::Flag(dflags | AudioDiskstream::NonLayered);
}
-
- boost::shared_ptr<AudioDiskstream> ds (new AudioDiskstream (_session, name(), dflags));
+ AudioDiskstream* dsp (new AudioDiskstream (_session, name(), dflags));
+ boost::shared_ptr<AudioDiskstream> ds (dsp);
_session.add_diskstream (ds);
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 8de786eb0e..e9eb3641da 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -99,6 +99,7 @@ AudioFileSource::AudioFileSource (Session& s, const ustring& path, bool embedded
if (init (path, true)) {
throw failed_constructor ();
}
+ cerr << "AFS1 created, " << path << endl;
}
/** Constructor used for new internal-to-session files. */
@@ -113,6 +114,7 @@ AudioFileSource::AudioFileSource (Session& s, const ustring& path, bool embedded
if (init (path, false)) {
throw failed_constructor ();
}
+ cerr << "AFS2 created, " << path << endl;
}
/** Constructor used for existing internal-to-session files. File must exist. */
@@ -128,11 +130,14 @@ AudioFileSource::AudioFileSource (Session& s, const XMLNode& node, bool must_exi
if (init (_name, must_exist)) {
throw failed_constructor ();
}
+ cerr << "AFS3 created, " << path() << endl;
}
AudioFileSource::~AudioFileSource ()
{
+ cerr << "AFS " << _name << " destructor, path = " << path() << endl;
if (removable()) {
+ cerr << "\tremoving file\n";
unlink (_path.c_str());
unlink (peakpath.c_str());
}
diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index 883bc0b41b..f7d6088aec 100644
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -276,6 +276,8 @@ nframes_t
AudioSource::write (Sample *dst, nframes_t cnt)
{
Glib::Mutex::Lock lm (_lock);
+ /* any write makes the fill not removable */
+ _flags = Flag (_flags & ~Removable);
return write_unlocked (dst, cnt);
}
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 0d27cb508a..b6cc9d6a04 100644
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -41,6 +41,7 @@
#include "ardour/ardour.h"
#include "ardour/audioengine.h"
+#include "ardour/debug.h"
#include "ardour/diskstream.h"
#include "ardour/utils.h"
#include "ardour/configuration.h"
@@ -130,6 +131,7 @@ Diskstream::~Diskstream ()
{
if (_playlist)
_playlist->release ();
+ DEBUG_TRACE (DEBUG::Destruction, string_compose ("Diskstream %1 deleted\n", _name));
}
void
diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index e5232f2384..6ebbf0b523 100644
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -77,8 +77,8 @@ bool
FileSource::removable () const
{
return (_flags & Removable)
- && ( (_flags & RemoveAtDestroy)
- || ((_flags & RemovableIfEmpty) && length(timeline_position()) == 0));
+ && ((_flags & RemoveAtDestroy) ||
+ ((_flags & RemovableIfEmpty) && length(timeline_position()) == 0));
}
int
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index 20c87fb1de..c59a5bb562 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -31,6 +31,7 @@
#include "pbd/stacktrace.h"
#include "pbd/enumwriter.h"
+#include "ardour/debug.h"
#include "ardour/region.h"
#include "ardour/playlist.h"
#include "ardour/session.h"
@@ -340,6 +341,7 @@ Region::~Region ()
{
notify_callbacks ();
GoingAway (); /* EMIT SIGNAL */
+ DEBUG_TRACE (DEBUG::Destruction, string_compose ("Region %1 deleted\n", _name));
}
void
diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 3039a7fc3b..91e6827e61 100644
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -163,6 +163,7 @@ Send::set_state (const XMLNode& node, int version)
_bitslot = _session.next_send_id();
} else {
sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+ cerr << this << " scanned " << prop->value() << " to get " << _bitslot << endl;
_session.mark_send_id (_bitslot);
}
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index ce1fbca846..febaf6ed11 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -37,6 +37,7 @@
#include "pbd/error.h"
#include <glibmm/thread.h>
+#include "pbd/boost_debug.h"
#include "pbd/pathscanner.h"
#include "pbd/stl_delete.h"
#include "pbd/basename.h"
@@ -62,6 +63,7 @@
#include "ardour/crossfade.h"
#include "ardour/cycle_timer.h"
#include "ardour/data_type.h"
+#include "ardour/debug.h"
#include "ardour/filename_extensions.h"
#include "ardour/internal_send.h"
#include "ardour/io_processor.h"
@@ -329,6 +331,8 @@ Session::~Session ()
void
Session::destroy ()
{
+ vector<void*> debug_pointers;
+
/* if we got to here, leaving pending capture state around
is a mistake.
*/
@@ -378,10 +382,7 @@ Session::destroy ()
Route::SyncOrderKeys.clear();
-#undef TRACK_DESTRUCTION
-#ifdef TRACK_DESTRUCTION
- cerr << "delete named selections\n";
-#endif /* TRACK_DESTRUCTION */
+ DEBUG_TRACE (DEBUG::Destruction, "delete named selections\n");
for (NamedSelectionList::iterator i = named_selections.begin(); i != named_selections.end(); ) {
NamedSelectionList::iterator tmp;
@@ -392,16 +393,16 @@ Session::destroy ()
i = tmp;
}
-#ifdef TRACK_DESTRUCTION
- cerr << "delete playlists\n";
-#endif /* TRACK_DESTRUCTION */
+ DEBUG_TRACE (DEBUG::Destruction, "delete playlists\n");
for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ) {
PlaylistList::iterator tmp;
tmp = i;
++tmp;
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for used playlist %1 ; pre-ref = %2\n", (*i)->name(), (*i).use_count()));
(*i)->drop_references ();
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("post-ref = %1\n", (*i).use_count()));
i = tmp;
}
@@ -412,7 +413,9 @@ Session::destroy ()
tmp = i;
++tmp;
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for unused playlist %1 ; pre-ref = %2\n", (*i)->name(), (*i).use_count()));
(*i)->drop_references ();
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("post-ref = %2\n", (*i).use_count()));
i = tmp;
}
@@ -420,70 +423,68 @@ Session::destroy ()
playlists.clear ();
unused_playlists.clear ();
-#ifdef TRACK_DESTRUCTION
- cerr << "delete regions\n";
-#endif /* TRACK_DESTRUCTION */
-
+ DEBUG_TRACE (DEBUG::Destruction, "delete regions\n");
for (RegionList::iterator i = regions.begin(); i != regions.end(); ) {
RegionList::iterator tmp;
tmp = i;
++tmp;
-
+
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for region %1 ; pre-ref = %2\n", i->second->name(), i->second.use_count()));
i->second->drop_references ();
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("\tpost-ref%2\n", i->second.use_count()));
i = tmp;
}
regions.clear ();
-#ifdef TRACK_DESTRUCTION
- cerr << "delete routes\n";
-#endif /* TRACK_DESTRUCTION */
+ DEBUG_TRACE (DEBUG::Destruction, "delete routes\n");
{
RCUWriter<RouteList> writer (routes);
boost::shared_ptr<RouteList> r = writer.get_copy ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for route %1 ; pre-ref = %2\n", (*i)->name(), (*i).use_count()));
(*i)->drop_references ();
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("post-ref = %1\n", (*i).use_count()));
+ debug_pointers.push_back ((*i).get());
}
r->clear ();
/* writer goes out of scope and updates master */
}
-
routes.flush ();
-#ifdef TRACK_DESTRUCTION
- cerr << "delete diskstreams\n";
-#endif /* TRACK_DESTRUCTION */
- {
- RCUWriter<DiskstreamList> dwriter (diskstreams);
- boost::shared_ptr<DiskstreamList> dsl = dwriter.get_copy();
- for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
- (*i)->drop_references ();
- }
- dsl->clear ();
- }
- diskstreams.flush ();
-
-#ifdef TRACK_DESTRUCTION
- cerr << "delete audio sources\n";
-#endif /* TRACK_DESTRUCTION */
+ DEBUG_TRACE (DEBUG::Destruction, "delete diskstreams\n");
+ {
+ RCUWriter<DiskstreamList> dwriter (diskstreams);
+ boost::shared_ptr<DiskstreamList> dsl = dwriter.get_copy();
+ for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for diskstream %1 ; pre-ref = %2\n", (*i)->name(), (*i).use_count()));
+ (*i)->drop_references ();
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("post-ref = %1\n", (*i).use_count()));
+ }
+ dsl->clear ();
+ }
+ diskstreams.flush ();
+
+ DEBUG_TRACE (DEBUG::Destruction, "delete sources\n");
for (SourceMap::iterator i = sources.begin(); i != sources.end(); ) {
SourceMap::iterator tmp;
tmp = i;
++tmp;
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for source %1 ; pre-ref = %2\n", i->second->path(), i->second.use_count()));
i->second->drop_references ();
+ DEBUG_TRACE(DEBUG::Destruction, string_compose ("\tpost-ref%1\n", i->second.use_count()));
i = tmp;
}
+ cerr << "Pre source clear, we have " << sources.size() << endl;
sources.clear ();
+ cerr << "Post source clear, we have " << sources.size() << endl;
-
-#ifdef TRACK_DESTRUCTION
- cerr << "delete route groups\n";
-#endif /* TRACK_DESTRUCTION */
+ DEBUG_TRACE (DEBUG::Destruction, "delete route groups\n");
for (list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
delete *i;
}
@@ -491,6 +492,10 @@ Session::destroy ()
Crossfade::set_buffer_size (0);
delete mmc;
+
+ for (vector<void*>::iterator x = debug_pointers.begin(); x != debug_pointers.end(); ++x) {
+ boost_debug_shared_ptr_show (cerr, *x);
+ }
}
void
@@ -1769,7 +1774,9 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
shared_ptr<AudioTrack> track;
try {
- track = boost::shared_ptr<AudioTrack>((new AudioTrack (*this, track_name, Route::Flag (0), mode)));
+ AudioTrack* at = new AudioTrack (*this, track_name, Route::Flag (0), mode);
+ boost_debug_shared_ptr_mark_interesting (at, typeid (at).name());
+ track = boost::shared_ptr<AudioTrack>(at);
if (track->input()->ensure_io (ChanCount(DataType::AUDIO, input_channels), false, this)) {
error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
@@ -3330,9 +3337,9 @@ Session::create_audio_source_for_session (AudioDiskstream& ds, uint32_t chan, bo
const size_t n_chans = ds.n_channels().n_audio();
const string name = new_audio_source_name (ds.name(), n_chans, chan, destructive);
const string path = new_source_path_from_name(DataType::AUDIO, name);
+
return boost::dynamic_pointer_cast<AudioFileSource> (
- SourceFactory::createWritable (
- DataType::AUDIO, *this, path, true, destructive, frame_rate()));
+ SourceFactory::createWritable (DataType::AUDIO, *this, path, true, destructive, frame_rate()));
}
/** Return a unique name based on \a base for a new internal MIDI source */
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 2e564b7eee..f53dd7106e 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -57,6 +57,7 @@
#include "midi++/mmc.h"
#include "midi++/port.h"
+#include "pbd/boost_debug.h"
#include "pbd/error.h"
#include "pbd/pathscanner.h"
#include "pbd/pthread_utils.h"
@@ -567,7 +568,8 @@ Session::load_diskstreams (const XMLNode& node)
try {
/* diskstreams added automatically by DiskstreamCreated handler */
if ((*citer)->name() == "AudioDiskstream" || (*citer)->name() == "DiskStream") {
- boost::shared_ptr<AudioDiskstream> dstream (new AudioDiskstream (*this, **citer));
+ AudioDiskstream* dsp (new AudioDiskstream (*this, **citer));
+ boost::shared_ptr<AudioDiskstream> dstream (dsp);
add_diskstream (dstream);
} else if ((*citer)->name() == "MidiDiskstream") {
boost::shared_ptr<MidiDiskstream> dstream (new MidiDiskstream (*this, **citer));
@@ -1402,7 +1404,9 @@ Session::XMLRouteFactory (const XMLNode& node, int version)
if (has_diskstream) {
if (type == DataType::AUDIO) {
- boost::shared_ptr<Route> ret (new AudioTrack (*this, node, version));
+ AudioTrack* at = new AudioTrack (*this, node, version);
+ boost_debug_shared_ptr_mark_interesting (at, typeid (at).name());
+ boost::shared_ptr<Route> ret (at);
return ret;
} else {
boost::shared_ptr<Route> ret (new MidiTrack (*this, node, version));
diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index 394d4b39af..10b7ead270 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -36,6 +36,7 @@
#include "pbd/pthread_utils.h"
#include "pbd/enumwriter.h"
+#include "ardour/debug.h"
#include "ardour/session.h"
#include "ardour/source.h"
#include "ardour/transient_detector.h"
@@ -75,6 +76,7 @@ Source::Source (Session& s, const XMLNode& node)
Source::~Source ()
{
notify_callbacks ();
+ DEBUG_TRACE (DEBUG::Destruction, string_compose ("Source %1 deleted\n", _name));
}
diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index 198a429c5d..999ae667dd 100644
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -22,6 +22,7 @@
#include "libardour-config.h"
#endif
+#include "pbd/boost_debug.h"
#include "pbd/error.h"
#include "pbd/convert.h"
#include "pbd/pthread_utils.h"
@@ -122,7 +123,9 @@ SourceFactory::setup_peakfile (boost::shared_ptr<Source> s, bool async)
boost::shared_ptr<Source>
SourceFactory::createSilent (Session& s, const XMLNode& node, nframes_t nframes, float sr)
{
- boost::shared_ptr<Source> ret (new SilentFileSource (s, node, nframes, sr));
+ Source* src = new SilentFileSource (s, node, nframes, sr);
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
// no analysis data - the file is non-existent
SourceCreated (ret);
return ret;
@@ -142,7 +145,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
try {
- boost::shared_ptr<Source> ret (new SndFileSource (s, node));
+ Source* src = new SndFileSource (s, node);
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
@@ -157,7 +162,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
/* this is allowed to throw */
- boost::shared_ptr<Source> ret (new CoreAudioSource (s, node));
+ Source *s = new CoreAudioSource (s, node);
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
@@ -172,7 +179,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
}
} else if (type == DataType::MIDI) {
- boost::shared_ptr<Source> ret (new SMFSource (s, node));
+ Source* src = new SMFSource (s, node);
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
ret->check_for_analysis_data_on_disk ();
SourceCreated (ret);
return ret;
@@ -191,8 +200,10 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, bo
try {
- boost::shared_ptr<Source> ret (new SndFileSource (s, path, embedded, chn, flags));
-
+ Source* src = new SndFileSource (s, path, embedded, chn, flags);
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
+
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
@@ -207,7 +218,9 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, bo
catch (failed_constructor& err) {
#ifdef USE_COREAUDIO_FOR_FILES
- boost::shared_ptr<Source> ret (new CoreAudioSource (s, path, embedded, chn, flags));
+ Source* src = new CoreAudioSource (s, path, embedded, chn, flags);
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
@@ -227,8 +240,10 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, bo
}
} else if (type == DataType::MIDI) {
-
- boost::shared_ptr<Source> ret (new SMFSource (s, path, embedded, SMFSource::Flag(0)));
+
+ Source* src = new SMFSource (s, path, embedded, SMFSource::Flag(0));
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
if (announce) {
SourceCreated (ret);
@@ -248,13 +263,15 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat
/* this might throw failed_constructor(), which is OK */
if (type == DataType::AUDIO) {
- boost::shared_ptr<Source> ret (new SndFileSource (s, path, embedded,
+ Source* src = new SndFileSource (s, path, embedded,
s.config.get_native_file_data_format(),
s.config.get_native_file_header_format(),
rate,
(destructive
? Source::Flag (SndFileSource::default_writable_flags | Source::Destructive)
- : SndFileSource::default_writable_flags)));
+ : SndFileSource::default_writable_flags));
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
@@ -269,7 +286,9 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat
} else if (type == DataType::MIDI) {
- boost::shared_ptr<Source> ret (new SMFSource (s, path, embedded, Source::Flag(0)));
+ Source* src = new SMFSource (s, path, embedded, Source::Flag(0));
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
// no analysis data - this is a new file
diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
new file mode 100644
index 0000000000..7a011e9dcc
--- /dev/null
+++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
@@ -0,0 +1,322 @@
+/*
+ Copyright (C) 2009 Paul Davis
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <gtkmm/box.h>
+
+namespace Gtkmm2ext {
+
+/** Parent class for children of a DnDVBox */
+class DnDVBoxChild
+{
+public:
+ virtual ~DnDVBoxChild () {}
+
+ /** @return The widget that is to be put into the DnDVBox */
+ virtual Gtk::Widget& widget () = 0;
+
+ /** @return An EventBox containing the widget that should be used for selection, dragging etc. */
+ virtual Gtk::EventBox& action_widget () = 0;
+
+ /** @return Text to use in the icon that is dragged */
+ virtual std::string drag_text () const = 0;
+};
+
+/** A VBox whose contents can be dragged and dropped */
+template <class T>
+class DnDVBox : public Gtk::EventBox
+{
+public:
+ DnDVBox () : _drag_icon (0), _expecting_unwanted_button_event (false)
+ {
+ _targets.push_back (Gtk::TargetEntry ("processor"));
+
+ add (_internal_vbox);
+ add_events (Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
+
+ signal_button_press_event().connect (bind (mem_fun (*this, &DnDVBox::button_press), (T *) 0));
+ signal_button_release_event().connect (bind (mem_fun (*this, &DnDVBox::button_release), (T *) 0));
+
+ drag_dest_set (_targets);
+ signal_drag_data_received().connect (mem_fun (*this, &DnDVBox::drag_data_received));
+ }
+
+ virtual ~DnDVBox ()
+ {
+ clear ();
+
+ delete _drag_icon;
+ }
+
+ /** Add a child at the end of the widget. The DnDVBox will take responsibility for deleting the child */
+ void add_child (T* child)
+ {
+ child->action_widget().drag_source_set (_targets);
+ child->action_widget().signal_drag_begin().connect (sigc::bind (mem_fun (*this, &DnDVBox::drag_begin), child));
+ child->action_widget().signal_drag_data_get().connect (sigc::bind (mem_fun (*this, &DnDVBox::drag_data_get), child));
+ child->action_widget().signal_drag_end().connect (sigc::bind (mem_fun (*this, &DnDVBox::drag_end), child));
+ child->action_widget().signal_button_press_event().connect (sigc::bind (mem_fun (*this, &DnDVBox::button_press), child));
+ child->action_widget().signal_button_release_event().connect (sigc::bind (mem_fun (*this, &DnDVBox::button_release), child));
+
+ _internal_vbox.pack_start (child->widget(), false, false);
+
+ _children.push_back (child);
+ child->widget().show_all ();
+ }
+
+ /** @return Children, sorted into the order that they are currently being displayed in the widget */
+ std::list<T*> children ()
+ {
+ std::list<T*> sorted_children;
+
+ std::list<Gtk::Widget*> widget_children = _internal_vbox.get_children ();
+ for (std::list<Gtk::Widget*>::iterator i = widget_children.begin(); i != widget_children.end(); ++i) {
+ T* c = child_from_widget (*i);
+
+ if (c) {
+ sorted_children.push_back (c);
+ }
+ }
+
+ return sorted_children;
+ }
+
+ /** @return Selected children */
+ std::list<T*> selection () const {
+ return _selection;
+ }
+
+ /** @param Child
+ * @return true if the child is selected, otherwise false */
+ bool selected (T* child) const {
+ return (find (_selection.begin(), _selection.end(), child) != _selection.end());
+ }
+
+ /** Clear all children from the widget */
+ void clear ()
+ {
+ _selection.clear ();
+
+ for (typename std::list<T*>::iterator i = _children.begin(); i != _children.end(); ++i) {
+ _internal_vbox.remove ((*i)->widget());
+ delete *i;
+ }
+
+ _children.clear ();
+ }
+
+
+ void select_all ()
+ {
+ clear_selection ();
+ for (typename std::list<T*>::iterator i = _children.begin(); i != _children.end(); ++i) {
+ add_to_selection (*i);
+ }
+
+ SelectionChanged (); /* EMIT SIGNAL */
+ }
+
+ void select_none ()
+ {
+ clear_selection ();
+
+ SelectionChanged (); /* EMIT SIGNAL */
+ }
+
+ /** @param x x coordinate.
+ * @param y y coordinate.
+ * @return Pair consisting of the child under (x, y) (or 0) and the index of the child under (x, y) (or -1)
+ */
+ std::pair<T*, int> get_child_at_position (int x, int y) const
+ {
+ std::list<Gtk::Widget const *> children = _internal_vbox.get_children ();
+ std::list<Gtk::Widget const *>::iterator i = children.begin();
+
+ int n = 0;
+ while (i != children.end()) {
+ Gdk::Rectangle const a = (*i)->get_allocation ();
+ if (y >= a.get_y() && y <= (a.get_y() + a.get_height())) {
+ break;
+ }
+ ++i;
+ ++n;
+ }
+
+ if (i == children.end()) {
+ return std::make_pair ((T *) 0, -1);
+ }
+
+ return std::make_pair (child_from_widget (*i), n);
+ }
+
+ /** Children have been reordered by a drag */
+ sigc::signal<void> Reordered;
+
+ /** A button has been pressed over the widget */
+ sigc::signal<bool, GdkEventButton*, T*> ButtonPress;
+
+ /** A button has been release over the widget */
+ sigc::signal<bool, GdkEventButton*, T*> ButtonRelease;
+
+ /** A child has been dropped onto this DnDVBox from another one;
+ * Parameters are the source DnDVBox, our child which the other one was dropped on (or 0) and the DragContext.
+ */
+ sigc::signal<void, DnDVBox*, T*, Glib::RefPtr<Gdk::DragContext> const & > DropFromAnotherBox;
+ sigc::signal<void> SelectionChanged;
+
+private:
+ void drag_begin (Glib::RefPtr<Gdk::DragContext> const & context, T* child)
+ {
+ /* make up an icon for the drag */
+ Gtk::Window* _drag_icon = new Gtk::Window (Gtk::WINDOW_POPUP);
+ _drag_icon->set_name (get_name ());
+ Gtk::Label* l = new Gtk::Label (child->drag_text ());
+ l->set_padding (4, 4);
+ _drag_icon->add (*Gtk::manage (l));
+ _drag_icon->show_all_children ();
+ int w, h;
+ _drag_icon->get_size (w, h);
+ _drag_icon->drag_set_as_icon (context, w / 2, h);
+
+ _drag_source = this;
+ }
+
+ void drag_data_get (Glib::RefPtr<Gdk::DragContext> const &, Gtk::SelectionData & selection_data, guint, guint, T* child)
+ {
+ selection_data.set (selection_data.get_target(), 8, (const guchar *) &child, sizeof (&child));
+ }
+
+ void drag_data_received (
+ Glib::RefPtr<Gdk::DragContext> const & context, int x, int y, Gtk::SelectionData const & selection_data, guint info, guint time
+ )
+ {
+ /* work out where it was dropped */
+ std::pair<T*, int> const drop = get_child_at_position (x, y);
+
+ if (_drag_source == this) {
+
+ /* dropped from ourselves onto ourselves */
+
+ T* child = *((T **) selection_data.get_data());
+
+ /* reorder child widgets accordingly */
+ if (drop.first == 0) {
+ _internal_vbox.reorder_child (child->widget(), -1);
+ } else {
+ _internal_vbox.reorder_child (child->widget(), drop.second);
+ }
+
+ } else {
+
+ /* drag started in another DnDVBox; raise a signal to say what happened */
+
+ std::list<T*> dropped = _drag_source->selection ();
+ DropFromAnotherBox (_drag_source, drop.first, context);
+ }
+
+ context->drag_finish (false, false, time);
+ }
+
+ void drag_end (Glib::RefPtr<Gdk::DragContext> const &, T *)
+ {
+ delete _drag_icon;
+ _drag_icon = 0;
+
+ Reordered (); /* EMIT SIGNAL */
+ }
+
+ bool button_press (GdkEventButton* ev, T* child)
+ {
+ if (_expecting_unwanted_button_event == true && child == 0) {
+ _expecting_unwanted_button_event = false;
+ return true;
+ }
+
+ if (child) {
+ _expecting_unwanted_button_event = true;
+ }
+
+ if (ev->button == 1 || ev->button == 3) {
+ if (!selected (child)) {
+ clear_selection ();
+ if (child) {
+ add_to_selection (child);
+ }
+ SelectionChanged (); /* EMIT SIGNAL */
+ }
+ }
+
+ return ButtonPress (ev, child); /* EMIT SIGNAL */
+ }
+
+ bool button_release (GdkEventButton* ev, T* child)
+ {
+ if (_expecting_unwanted_button_event == true && child == 0) {
+ _expecting_unwanted_button_event = false;
+ return true;
+ }
+
+ if (child) {
+ _expecting_unwanted_button_event = true;
+ }
+
+ return ButtonRelease (ev, child); /* EMIT SIGNAL */
+ }
+
+ void clear_selection ()
+ {
+ for (typename std::list<T*>::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ (*i)->action_widget().set_state (Gtk::STATE_NORMAL);
+ }
+ _selection.clear ();
+ }
+
+ void add_to_selection (T* child)
+ {
+ child->action_widget().set_state (Gtk::STATE_SELECTED);
+ _selection.push_back (child);
+ }
+
+ T* child_from_widget (Gtk::Widget const * w) const
+ {
+ typename std::list<T*>::const_iterator i = _children.begin();
+ while (i != _children.end() && &(*i)->widget() != w) {
+ ++i;
+ }
+
+ if (i == _children.end()) {
+ return 0;
+ }
+
+ return *i;
+ }
+
+ Gtk::VBox _internal_vbox;
+ std::list<Gtk::TargetEntry> _targets;
+ std::list<T*> _children;
+ std::list<T*> _selection;
+ Gtk::Window* _drag_icon;
+ bool _expecting_unwanted_button_event;
+
+ static DnDVBox* _drag_source;
+};
+
+template <class T>
+DnDVBox<T>* DnDVBox<T>::_drag_source = 0;
+
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-13 05:24:16 +0000