summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-04-30 01:13:04 +0000
committerCarl Hetherington <carl@carlh.net>2012-04-30 01:13:04 +0000
commit0b0d252acf107dd1498fd212d32677089d20bdc4 (patch)
treea3bdaa3b5e43583019e8c3171c7cbc55463b6ef3 /gtk2_ardour
parent7614dc158adf88f5eacf96b4966279e83f0eef0b (diff)
Remove un-read variable.
git-svn-id: svn://localhost/ardour2/branches/3.0@12121 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/midi_region_view.cc14
-rw-r--r--gtk2_ardour/midi_region_view.h1
2 files changed, 2 insertions, 13 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 154cd158dc..9409f894f3 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -89,7 +89,6 @@ PBD::Signal1<void, MidiRegionView *> MidiRegionView::SelectionCleared;
MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color const & basic_color)
: RegionView (parent, tv, r, spu, basic_color)
- , _force_channel(-1)
, _last_channel_selection(0xFFFF)
, _current_range_min(0)
, _current_range_max(0)
@@ -126,7 +125,6 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color& basic_color,
TimeAxisViewItem::Visibility visibility)
: RegionView (parent, tv, r, spu, basic_color, false, visibility)
- , _force_channel(-1)
, _last_channel_selection(0xFFFF)
, _current_range_min(0)
, _current_range_max(0)
@@ -171,7 +169,6 @@ MidiRegionView::parameter_changed (std::string const & p)
MidiRegionView::MidiRegionView (const MidiRegionView& other)
: sigc::trackable(other)
, RegionView (other)
- , _force_channel(-1)
, _last_channel_selection(0xFFFF)
, _current_range_min(0)
, _current_range_max(0)
@@ -206,7 +203,6 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other)
MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<MidiRegion> region)
: RegionView (other, boost::shared_ptr<Region> (region))
- , _force_channel(-1)
, _last_channel_selection(0xFFFF)
, _current_range_min(0)
, _current_range_max(0)
@@ -3109,15 +3105,9 @@ MidiRegionView::set_frame_color()
void
MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask)
{
- switch (mode) {
- case AllChannels:
- case FilterChannels:
- _force_channel = -1;
- break;
- case ForceChannel:
- _force_channel = mask;
+ if (mode == ForceChannel) {
mask = 0xFFFF; // Show all notes as active (below)
- };
+ }
// Update notes for selection
for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index e34c80de44..c3084aee38 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -363,7 +363,6 @@ private:
void show_verbose_cursor (std::string const &, double, double) const;
void show_verbose_cursor (boost::shared_ptr<NoteType>) const;
- int8_t _force_channel;
uint16_t _last_channel_selection;
uint8_t _current_range_min;
uint8_t _current_range_max;