From 0bab5cffe42b4706d2e34fba31e2e3485917850d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 17 Jan 2015 17:25:35 -0500 Subject: [PATCH] fix up a few mistakes during merging playhead priority changes from Ardour --- gtk2_ardour/ardour_ui2.cc | 13 +++---------- libs/ardour/ardour/types.h | 2 -- libs/ardour/enums.cc | 14 -------------- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 3baaaab89e..299c07bc2b 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -184,16 +184,9 @@ ARDOUR_UI::setup_transport () transport_frame.set_name ("BaseFrame"); transport_frame.add (transport_base); - transport_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), - static_cast(&transport_frame))); - transport_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), - static_cast (&transport_frame), 1)); - transport_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), - static_cast(&transport_frame))); - transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), - static_cast (&transport_frame), 1)); - - /* build auto-return dropdown */ + /* XXX WAVES DEMO CODE + build auto-return dropdown + */ auto_return_dropdown.set_text (_("Auto Return")); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index b22ddc3ae6..b46c2dc123 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -634,7 +634,6 @@ std::istream& operator>>(std::istream& o, ARDOUR::WaveformScale& sf); std::istream& operator>>(std::istream& o, ARDOUR::WaveformShape& sf); std::istream& operator>>(std::istream& o, ARDOUR::PositionLockStyle& sf); std::istream& operator>>(std::istream& o, ARDOUR::FadeShape& sf); -std::istream& operator>>(std::istream& o, ARDOUR::RegionSelectionAfterSplit& sf); std::istream& operator>>(std::istream& o, ARDOUR::AutoReturnTarget& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::SampleFormat& sf); @@ -659,7 +658,6 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::WaveformScale& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::WaveformShape& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::PositionLockStyle& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::FadeShape& sf); -std::ostream& operator<<(std::ostream& o, const ARDOUR::RegionSelectionAfterSplit& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::AutoReturnTarget& sf); /* because these operators work on types which can be used when making diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index 7728856cd4..54368feded 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -960,20 +960,6 @@ std::ostream& operator<<(std::ostream& o, const FadeShape& var) return o << s; } -std::istream& operator>>(std::istream& o, RegionSelectionAfterSplit& var) -{ - std::string s; - o >> s; - var = (RegionSelectionAfterSplit) string_2_enum (s, var); - return o; -} - -std::ostream& operator<<(std::ostream& o, const RegionSelectionAfterSplit& var) -{ - std::string s = enum_2_string (var); - return o << s; -} - std::istream& operator>>(std::istream& o, AutoReturnTarget& var) { std::string s;