diff options
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_display.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/audio_region_view.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/bundle_manager.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/bundle_manager.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/editor_drag.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_drag.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/processor_box.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/processor_box.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/route_group_dialog.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/route_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/speaker_dialog.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/stereo_panner.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/sys_ex.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/sys_ex.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/tempo_lines.h | 1 |
19 files changed, 2 insertions, 31 deletions
diff --git a/gtk2_ardour/ardour_display.h b/gtk2_ardour/ardour_display.h index 3772d5423f..8b7712ddcc 100644 --- a/gtk2_ardour/ardour_display.h +++ b/gtk2_ardour/ardour_display.h @@ -53,10 +53,6 @@ class ArdourDisplay : public ArdourButton private: Gtk::Menu _menu; - - bool _hovering; - bool _grabbed; - float _grabbed_y; }; #endif /* __gtk2_ardour_ardour_menu_h__ */ diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 0a2222dedd..0a6c57bd29 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -72,7 +72,6 @@ using namespace PBD; using namespace Editing; using namespace ArdourCanvas; -static const int32_t sync_mark_width = 9; static double const handle_size = 10; /* height of fade handles */ AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu, diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index 6dc34d3388..8302e6dc2b 100644 --- a/gtk2_ardour/bundle_manager.cc +++ b/gtk2_ardour/bundle_manager.cc @@ -424,7 +424,6 @@ NameChannelDialog::NameChannelDialog () NameChannelDialog::NameChannelDialog (boost::shared_ptr<Bundle> b, uint32_t c) : ArdourDialog (_("Rename Channel")), _bundle (b), - _channel (c), _adding (false) { _name.set_text (b->channel_name (c)); diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h index 71b99684d7..468346e54c 100644 --- a/gtk2_ardour/bundle_manager.h +++ b/gtk2_ardour/bundle_manager.h @@ -131,7 +131,6 @@ private: void setup (); boost::shared_ptr<ARDOUR::Bundle> _bundle; - uint32_t _channel; Gtk::Entry _name; bool _adding; }; diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 9e03846d40..ea36be25ad 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -4110,9 +4110,7 @@ SelectionDrag::SelectionDrag (Editor* e, ArdourCanvas::Item* i, Operation o) : Drag (e, i) , _operation (o) , _add (false) - , _extend (false) , _original_pointer_time_axis (-1) - , _last_pointer_time_axis (-1) , _time_selection_at_start (!_editor->get_selection().time.empty()) { DEBUG_TRACE (DEBUG::Drags, "New SelectionDrag\n"); diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index 9b4a0a6521..2f4c2f2e0d 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -829,8 +829,6 @@ private: AutomationLine* _line; double _fixed_grab_x; double _fixed_grab_y; - uint32_t _before; - uint32_t _after; double _cumulative_y_drag; }; @@ -978,9 +976,7 @@ public: private: Operation _operation; bool _add; - bool _extend; int _original_pointer_time_axis; - int _last_pointer_time_axis; std::list<TimeAxisView*> _added_time_axes; bool _time_selection_at_start; framepos_t start_at_start; diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index e5fc42af17..f0de126c67 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -4963,7 +4963,7 @@ Editor::quantize_region () qd->hide (); if (r == Gtk::RESPONSE_OK) { - Quantize quant (*_session, qd->snap_start(), qd->snap_end(), + Quantize quant (qd->snap_start(), qd->snap_end(), qd->start_grid_size(), qd->end_grid_size(), qd->strength(), qd->swing(), qd->threshold()); diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index b82115da9e..21ae56b8c2 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -3388,8 +3388,6 @@ MidiRegionView::paste_internal (framepos_t pos, unsigned paste_count, float time return; } - PublicEditor& editor = trackview.editor (); - start_note_diff_command (_("paste")); const Evoral::MusicalTime snap_beats = get_grid_beats(pos); diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 177caa0056..831c5158b8 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -80,8 +80,6 @@ MixerStrip* MixerStrip::_entered_mixer_strip; PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion; -static const int _button_vpad = 4; - MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) : AxisView(sess) , RouteUI (sess) diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 84507b250c..1a9cc87214 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -108,7 +108,6 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo , _parent (parent) , _processor (p) , _width (w) - , _visual_state (Gtk::STATE_NORMAL) , _input_icon(true) , _output_icon(false) { diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index 8caee04006..a40b8e7bb5 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -163,7 +163,6 @@ private: ProcessorBox* _parent; boost::shared_ptr<ARDOUR::Processor> _processor; Width _width; - Gtk::StateType _visual_state; PBD::ScopedConnection active_connection; PBD::ScopedConnection name_connection; PBD::ScopedConnection config_connection; diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 0cb8441fd9..716918f3a6 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -67,8 +67,7 @@ class ClickOptions : public OptionEditorBox { public: ClickOptions (RCConfiguration* c, Gtk::Window* p) - : _rc_config (c), - _parent (p) + : _rc_config (c) { Table* t = manage (new Table (2, 3)); t->set_spacings (4); @@ -154,7 +153,6 @@ private: } RCConfiguration* _rc_config; - Gtk::Window* _parent; Entry _click_path_entry; Entry _click_emphasis_path_entry; }; diff --git a/gtk2_ardour/route_group_dialog.h b/gtk2_ardour/route_group_dialog.h index 1200175e99..5e2521d300 100644 --- a/gtk2_ardour/route_group_dialog.h +++ b/gtk2_ardour/route_group_dialog.h @@ -50,7 +50,6 @@ private: Gtk::CheckButton _route_active; Gtk::CheckButton _share_color; Gtk::CheckButton _share_monitoring; - Gtk::Button* _ok; Gtk::ColorButton _color; void gain_toggled (); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index c7cec3398a..dcdf7fa778 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -68,8 +68,6 @@ uint32_t RouteUI::_max_invert_buttons = 3; PBD::Signal1<void, boost::shared_ptr<Route> > RouteUI::BusSendDisplayChanged; boost::weak_ptr<Route> RouteUI::_showing_sends_to; -static const int _button_vpad = 2; - RouteUI::RouteUI (ARDOUR::Session* sess) : AxisView(sess) , mute_menu(0) diff --git a/gtk2_ardour/speaker_dialog.h b/gtk2_ardour/speaker_dialog.h index 2fce9e55c3..9521700380 100644 --- a/gtk2_ardour/speaker_dialog.h +++ b/gtk2_ardour/speaker_dialog.h @@ -48,7 +48,6 @@ private: Gtk::SpinButton azimuth_spinner; Gtk::Button add_speaker_button; Gtk::Button remove_speaker_button; - int32_t selected_speaker; int width; ///< width of the circle int height; ///< height of the circle int x_origin; ///< x origin of our stuff within the drawing area diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h index 8bab160d60..2f37e5f1b7 100644 --- a/gtk2_ardour/stereo_panner.h +++ b/gtk2_ardour/stereo_panner.h @@ -66,7 +66,6 @@ class StereoPanner : public PannerInterface boost::shared_ptr<PBD::Controllable> width_control; PBD::ScopedConnectionList panvalue_connections; PBD::ScopedConnectionList panshell_connections; - bool dragging; bool dragging_position; bool dragging_left; bool dragging_right; diff --git a/gtk2_ardour/sys_ex.cc b/gtk2_ardour/sys_ex.cc index 817c623758..ddc6e79ad5 100644 --- a/gtk2_ardour/sys_ex.cc +++ b/gtk2_ardour/sys_ex.cc @@ -31,7 +31,6 @@ SysEx::SysEx ( double height, double x, double y) - : _region (region) { _flag = new ArdourCanvas::Flag ( parent, diff --git a/gtk2_ardour/sys_ex.h b/gtk2_ardour/sys_ex.h index a0bb1df347..cc3559ba1f 100644 --- a/gtk2_ardour/sys_ex.h +++ b/gtk2_ardour/sys_ex.h @@ -47,7 +47,6 @@ public: private: bool event_handler (GdkEvent* ev); - MidiRegionView& _region; ArdourCanvas::Flag* _flag; }; diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h index 99a6a6b93f..5bf60eb226 100644 --- a/gtk2_ardour/tempo_lines.h +++ b/gtk2_ardour/tempo_lines.h @@ -37,7 +37,6 @@ public: private: ArdourCanvas::LineSet lines; - double _height; }; #endif /* __ardour_tempo_lines_h__ */ |