smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Amend last commit - remove some code.

Browse source
This commit is contained in:
nick_m 2016-08-20 05:41:12 +10:00
parent 869a9cb5df
commit c1b950373f
3 changed files with 20 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gtk2_ardour/editor_mouse.cc
View file

@ -1754,7 +1754,11 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
break; break;
} }
entered_marker = m_marker; entered_marker = m_marker;
m_marker->set_enter_color (); if (m_marker->meter().position_lock_style() == MusicTime) {
m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker"));
} else {
m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
}
break; break;
case TempoMarkerItem: case TempoMarkerItem:
@ -1762,7 +1766,11 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
break; break;
} }
entered_marker = t_marker; entered_marker = t_marker;
t_marker->set_enter_color (); if (t_marker->tempo().position_lock_style() == MusicTime) {
t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
} else {
t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
}
break; break;
case FadeInHandleItem: case FadeInHandleItem:
@ -1878,7 +1886,11 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
break; break;
} }
entered_marker = 0; entered_marker = 0;
m_marker->set_leave_color (); if (m_marker->meter().position_lock_style() == MusicTime) {
m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
} else {
m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker"));
}
break; break;
case TempoMarkerItem: case TempoMarkerItem:
@ -1886,7 +1898,11 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
break; break;
} }
entered_marker = 0; entered_marker = 0;
t_marker->set_leave_color (); if (t_marker->tempo().position_lock_style() == MusicTime) {
t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
} else {
t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
}
break; break;
case FadeInTrimHandleItem: case FadeInTrimHandleItem:

41
gtk2_ardour/marker.cc
View file

@ -556,26 +556,6 @@ TempoMarker::update_height_mark (const double& ratio)
mark->set (*points); mark->set (*points);
} }
void
TempoMarker::set_enter_color ()
{
if (_tempo.position_lock_style() == MusicTime) {
set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
} else {
set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
}
}
void
TempoMarker::set_leave_color ()
{
if (_tempo.position_lock_style() == MusicTime) {
set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
} else {
set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
}
}
/***********************************************************************/ /***********************************************************************/
MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text, MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
@ -590,24 +570,3 @@ MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent,
MeterMarker::~MeterMarker () MeterMarker::~MeterMarker ()
{ {
} }
void
MeterMarker::set_enter_color ()
{
if (_meter.position_lock_style() == MusicTime) {
set_color_rgba (UIConfiguration::instance().color ("meter marker"));
} else {
set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
}
}
void
MeterMarker::set_leave_color ()
{
if (_meter.position_lock_style() == MusicTime) {
set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
} else {
set_color_rgba (UIConfiguration::instance().color ("meter marker"));
}
}

6
gtk2_ardour/marker.h
View file

@ -146,9 +146,6 @@ class TempoMarker : public ArdourMarker
ARDOUR::TempoSection& tempo() const { return _tempo; } ARDOUR::TempoSection& tempo() const { return _tempo; }
void update_height_mark (const double& ratio); void update_height_mark (const double& ratio);
void set_enter_color();
void set_leave_color();
private: private:
ARDOUR::TempoSection& _tempo; ARDOUR::TempoSection& _tempo;
}; };
@ -161,9 +158,6 @@ class MeterMarker : public ArdourMarker
ARDOUR::MeterSection& meter() const { return _meter; } ARDOUR::MeterSection& meter() const { return _meter; }
void set_enter_color();
void set_leave_color();
private: private:
ARDOUR::MeterSection& _meter; ARDOUR::MeterSection& _meter;
}; };