From ea5876b8364beb3b1b2fb82909b00ff107dbb6ca Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 25 Nov 2014 02:11:44 -0500 Subject: Remove dead code. --- gtk2_ardour/ardour_display.h | 4 ---- gtk2_ardour/audio_region_view.cc | 1 - gtk2_ardour/bundle_manager.cc | 1 - gtk2_ardour/bundle_manager.h | 1 - gtk2_ardour/editor_drag.cc | 2 -- gtk2_ardour/editor_drag.h | 4 ---- gtk2_ardour/editor_ops.cc | 2 +- gtk2_ardour/midi_region_view.cc | 2 -- gtk2_ardour/mixer_strip.cc | 2 -- gtk2_ardour/processor_box.cc | 1 - gtk2_ardour/processor_box.h | 1 - gtk2_ardour/rc_option_editor.cc | 4 +--- gtk2_ardour/route_group_dialog.h | 1 - gtk2_ardour/route_ui.cc | 2 -- gtk2_ardour/speaker_dialog.h | 1 - gtk2_ardour/stereo_panner.h | 1 - gtk2_ardour/sys_ex.cc | 1 - gtk2_ardour/sys_ex.h | 1 - gtk2_ardour/tempo_lines.h | 1 - libs/ardour/ardour/audio_track_importer.h | 3 --- libs/ardour/ardour/quantize.h | 5 +---- libs/ardour/ardour/slave.h | 1 - libs/ardour/ardour/sndfilesource.h | 2 -- libs/ardour/audio_track_importer.cc | 3 +-- libs/ardour/quantize.cc | 5 ++--- libs/ardour/session_butler.cc | 14 -------------- libs/canvas/canvas/curve.h | 1 - libs/canvas/canvas/image.h | 1 - libs/canvas/curve.cc | 2 -- libs/canvas/wave_view.cc | 6 ------ libs/gtkmm2ext/gtkmm2ext/selector.h | 2 -- libs/pbd/pbd/pool.h | 2 -- libs/pbd/pbd/system_exec.h | 1 - libs/pbd/pbd/uuid.h | 8 -------- libs/surfaces/generic_midi/midiaction.h | 1 - libs/surfaces/mackie/controls.cc | 2 +- 36 files changed, 7 insertions(+), 85 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 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 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 _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 _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 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 _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 > RouteUI::BusSendDisplayChanged; boost::weak_ptr 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 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__ */ diff --git a/libs/ardour/ardour/audio_track_importer.h b/libs/ardour/ardour/audio_track_importer.h index 58789177e3..eddf6c67a2 100644 --- a/libs/ardour/ardour/audio_track_importer.h +++ b/libs/ardour/ardour/audio_track_importer.h @@ -40,9 +40,6 @@ class LIBARDOUR_API AudioTrackImportHandler : public ElementImportHandler AudioTrackImportHandler (XMLTree const & source, Session & session, AudioPlaylistImportHandler & pl_handler); virtual ~AudioTrackImportHandler () {} virtual std::string get_info () const; - - private: - AudioPlaylistImportHandler & pl_handler; }; diff --git a/libs/ardour/ardour/quantize.h b/libs/ardour/ardour/quantize.h index 1434a85f8e..09ba5f2aa2 100644 --- a/libs/ardour/ardour/quantize.h +++ b/libs/ardour/ardour/quantize.h @@ -27,11 +27,9 @@ namespace ARDOUR { -class Session; - class LIBARDOUR_API Quantize : public MidiOperator { public: - Quantize (ARDOUR::Session&, bool snap_start, bool snap_end, + Quantize (bool snap_start, bool snap_end, double start_grid, double end_grid, float strength, float swing, float threshold); ~Quantize (); @@ -42,7 +40,6 @@ public: std::string name() const { return std::string ("quantize"); } private: - ARDOUR::Session& session; bool _snap_start; bool _snap_end; double _start_grid; diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 6df10c3f9a..32fbf20c11 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -507,7 +507,6 @@ class LIBARDOUR_API Engine_Slave : public Slave private: AudioEngine& engine; - double speed; bool _starting; }; diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h index 99fb9f4d09..7f5e538f4a 100644 --- a/libs/ardour/ardour/sndfilesource.h +++ b/libs/ardour/ardour/sndfilesource.h @@ -105,8 +105,6 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource { bool _capture_end; framepos_t capture_start_frame; framepos_t file_pos; // unit is frames - framecnt_t xfade_out_count; - framecnt_t xfade_in_count; Sample* xfade_buf; framecnt_t crossfade (Sample* data, framecnt_t cnt, int dir); diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc index b3ac93e010..cf9a25962c 100644 --- a/libs/ardour/audio_track_importer.cc +++ b/libs/ardour/audio_track_importer.cc @@ -40,8 +40,7 @@ using namespace ARDOUR; /*** AudioTrackImportHandler ***/ AudioTrackImportHandler::AudioTrackImportHandler (XMLTree const & source, Session & session, AudioPlaylistImportHandler & pl_handler) : - ElementImportHandler (source, session), - pl_handler (pl_handler) + ElementImportHandler (source, session) { XMLNode const * root = source.root(); XMLNode const * routes; diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc index b543c5e67b..dc1976e9ff 100644 --- a/libs/ardour/quantize.cc +++ b/libs/ardour/quantize.cc @@ -35,11 +35,10 @@ using namespace ARDOUR; * 0.25 = quantize to beats/4, etc. */ -Quantize::Quantize (Session& s, bool snap_start, bool snap_end, +Quantize::Quantize (bool snap_start, bool snap_end, double start_grid, double end_grid, float strength, float swing, float threshold) - : session (s) - , _snap_start (snap_start) + : _snap_start (snap_start) , _snap_end (snap_end) , _start_grid(start_grid) , _end_grid(end_grid) diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc index 3e7c2226cc..613233cacb 100644 --- a/libs/ardour/session_butler.cc +++ b/libs/ardour/session_butler.cc @@ -34,20 +34,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -/* XXX put this in the right place */ - -static inline uint32_t next_power_of_two (uint32_t n) -{ - --n; - n |= n >> 16; - n |= n >> 8; - n |= n >> 4; - n |= n >> 2; - n |= n >> 1; - ++n; - return n; -} - /*--------------------------------------------------------------------------- BUTLER THREAD ---------------------------------------------------------------------------*/ diff --git a/libs/canvas/canvas/curve.h b/libs/canvas/canvas/curve.h index d27291e353..fad1119b39 100644 --- a/libs/canvas/canvas/curve.h +++ b/libs/canvas/canvas/curve.h @@ -54,7 +54,6 @@ class LIBCANVAS_API Curve : public PolyItem, public InterpolatedCurve Points samples; Points::size_type n_samples; uint32_t points_per_segment; - InterpolatedCurve::SplineType curve_type; CurveFill curve_fill; void interpolate (); diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h index 64d70a5751..3e6f820963 100644 --- a/libs/canvas/canvas/image.h +++ b/libs/canvas/canvas/image.h @@ -97,7 +97,6 @@ private: Cairo::Format _format; int _width; int _height; - int _data; mutable boost::shared_ptr _current; boost::shared_ptr _pending; mutable bool _need_render; diff --git a/libs/canvas/curve.cc b/libs/canvas/curve.cc index ba6ac68df6..78d47f07e9 100644 --- a/libs/canvas/curve.cc +++ b/libs/canvas/curve.cc @@ -31,7 +31,6 @@ Curve::Curve (Canvas* c) : PolyItem (c) , n_samples (0) , points_per_segment (16) - , curve_type (CatmullRomCentripetal) , curve_fill (None) { } @@ -40,7 +39,6 @@ Curve::Curve (Item* parent) : PolyItem (parent) , n_samples (0) , points_per_segment (16) - , curve_type (CatmullRomCentripetal) , curve_fill (None) { } diff --git a/libs/canvas/wave_view.cc b/libs/canvas/wave_view.cc index a8e4a3f286..b5538a834a 100644 --- a/libs/canvas/wave_view.cc +++ b/libs/canvas/wave_view.cc @@ -176,12 +176,6 @@ WaveView::set_samples_per_pixel (double samples_per_pixel) } } -static inline double -image_to_window (double wave_origin, double image_start) -{ - return wave_origin + image_start; -} - static inline double window_to_image (double wave_origin, double image_start) { diff --git a/libs/gtkmm2ext/gtkmm2ext/selector.h b/libs/gtkmm2ext/gtkmm2ext/selector.h index e1a0c1a530..d768ace8bb 100644 --- a/libs/gtkmm2ext/gtkmm2ext/selector.h +++ b/libs/gtkmm2ext/gtkmm2ext/selector.h @@ -96,8 +96,6 @@ public: void *refill_arg; gint selected_row; gint selected_column; - gint chosen_row; - gint chosen_column; void refill (); void chosen (); diff --git a/libs/pbd/pbd/pool.h b/libs/pbd/pbd/pool.h index 165a3aac4b..a28325cebf 100644 --- a/libs/pbd/pbd/pool.h +++ b/libs/pbd/pbd/pool.h @@ -129,8 +129,6 @@ class LIBPBD_API PerThreadPool private: Glib::Threads::Private _key; std::string _name; - unsigned long _item_size; - unsigned long _nitems; /** mutex to protect either changes to the _trash variable, or writes to the RingBuffer */ Glib::Threads::Mutex _trash_mutex; diff --git a/libs/pbd/pbd/system_exec.h b/libs/pbd/pbd/system_exec.h index ce6e5a9c4f..b554bdca94 100644 --- a/libs/pbd/pbd/system_exec.h +++ b/libs/pbd/pbd/system_exec.h @@ -221,7 +221,6 @@ class LIBPBD_API SystemExec void init (); pthread_mutex_t write_lock; - int fdin; ///< file-descriptor for writing to child's STDIN. This variable is identical to pin[1] but also used as status check if the stdin pipe is open: <0 means closed. int pok[2]; int pin[2]; int pout[2]; diff --git a/libs/pbd/pbd/uuid.h b/libs/pbd/pbd/uuid.h index 77e84c5f09..39817ade1a 100644 --- a/libs/pbd/pbd/uuid.h +++ b/libs/pbd/pbd/uuid.h @@ -41,14 +41,6 @@ class LIBPBD_API UUID : public boost::uuids::uuid { : boost::uuids::uuid(u) {} - operator boost::uuids::uuid() { - return static_cast(*this); - } - - operator boost::uuids::uuid() const { - return static_cast(*this); - } - UUID& operator= (std::string const & str); std::string to_s () const; diff --git a/libs/surfaces/generic_midi/midiaction.h b/libs/surfaces/generic_midi/midiaction.h index e2a29143ad..5686af32be 100644 --- a/libs/surfaces/generic_midi/midiaction.h +++ b/libs/surfaces/generic_midi/midiaction.h @@ -55,7 +55,6 @@ class MIDIAction : public MIDIInvokable int set_state (const XMLNode&, int version); private: - Gtk::Action* _action; void execute (); }; diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc index e5b8a28ab7..1ebc877ef9 100644 --- a/libs/surfaces/mackie/controls.cc +++ b/libs/surfaces/mackie/controls.cc @@ -118,7 +118,7 @@ void Control::stop_touch (double when, bool mark) { if (normal_ac) { - return normal_ac->stop_touch (when, mark); + return normal_ac->stop_touch (mark, when); } } -- cgit v1.2.3