smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-26 08:27:43 +01:00
Code Issues Projects Releases Wiki Activity

fix up a few mistakes during merging playhead priority changes from Ardour

Browse source
This commit is contained in:
Paul Davis 2015-01-17 17:25:35 -05:00
parent cd61673238
commit 0bab5cffe4
3 changed files with 3 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gtk2_ardour/ardour_ui2.cc
View file

@ -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<Box*>(&top_packer),
static_cast<Widget*>(&transport_frame)));
transport_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
static_cast<Widget*> (&transport_frame), 1));
transport_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
static_cast<Widget*>(&transport_frame)));
transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
static_cast<Widget*> (&transport_frame), 1));
/* build auto-return dropdown */
/* XXX WAVES DEMO CODE
build auto-return dropdown
*/
auto_return_dropdown.set_text (_("Auto Return"));

2
libs/ardour/ardour/types.h
View file

@ -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

14
libs/ardour/enums.cc
View file

@ -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;