diff options
| -rw-r--r-- | libs/ardour/ardour/interpolation.h | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/interface.cc | 6 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 88 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol_poll.cc | 4 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mackie_jog_wheel.cc | 10 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mackie_port.cc | 6 | ||||
| -rw-r--r-- | libs/surfaces/mackie/surface.h | 4 |
7 files changed, 60 insertions, 60 deletions
diff --git a/libs/ardour/ardour/interpolation.h b/libs/ardour/ardour/interpolation.h index 98b6e7e775..cdd3bfc1b5 100644 --- a/libs/ardour/ardour/interpolation.h +++ b/libs/ardour/ardour/interpolation.h @@ -28,7 +28,7 @@ class Interpolation { double target_speed() const { return _target_speed; } double speed() const { return _speed; } - void add_channel_to (int input_buffer_size, int output_buffer_size) { phase.push_back (0.0); } + void add_channel_to (int /*input_buffer_size*/, int /*output_buffer_size*/) { phase.push_back (0.0); } void remove_channel_from () { phase.pop_back (); } void reset () { diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc index 7872d47a78..ec42557c37 100644 --- a/libs/surfaces/mackie/interface.cc +++ b/libs/surfaces/mackie/interface.cc @@ -27,7 +27,7 @@ using namespace PBD; using namespace std; ControlProtocol* -new_mackie_protocol (ControlProtocolDescriptor* descriptor, Session* s) +new_mackie_protocol (ControlProtocolDescriptor*, Session* s) { if ( Config->get_mmc_port_name().substr(0,3) == "mcu" ) { @@ -62,7 +62,7 @@ new_mackie_protocol (ControlProtocolDescriptor* descriptor, Session* s) } void -delete_mackie_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* cp) +delete_mackie_protocol (ControlProtocolDescriptor*, ControlProtocol* cp) { try { @@ -81,7 +81,7 @@ delete_mackie_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* prevent loading of the lib. */ bool -probe_mackie_protocol (ControlProtocolDescriptor* descriptor) +probe_mackie_protocol (ControlProtocolDescriptor*) { return MackieControlProtocol::probe(); } diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 29a28ffcd5..04f44dba5a 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -998,7 +998,7 @@ void MackieControlProtocol::notify_record_enable_changed( RouteSignal * route_si } } -void MackieControlProtocol::notify_active_changed( RouteSignal * route_signal ) +void MackieControlProtocol::notify_active_changed (RouteSignal *) { try { @@ -1221,7 +1221,7 @@ void MackieControlProtocol::poll_session_data() // Transport Buttons ///////////////////////////////////// -LedState MackieControlProtocol::frm_left_press( Button & button ) +LedState MackieControlProtocol::frm_left_press (Button &) { // can use first_mark_before/after as well unsigned long elapsed = _frm_left_last.restart(); @@ -1249,12 +1249,12 @@ LedState MackieControlProtocol::frm_left_press( Button & button ) return on; } -LedState MackieControlProtocol::frm_left_release( Button & button ) +LedState MackieControlProtocol::frm_left_release (Button &) { return off; } -LedState MackieControlProtocol::frm_right_press( Button & button ) +LedState MackieControlProtocol::frm_right_press (Button &) { // can use first_mark_before/after as well Location * loc = session->locations()->first_location_after ( @@ -1264,34 +1264,34 @@ LedState MackieControlProtocol::frm_right_press( Button & button ) return on; } -LedState MackieControlProtocol::frm_right_release( Button & button ) +LedState MackieControlProtocol::frm_right_release (Button &) { return off; } -LedState MackieControlProtocol::stop_press( Button & button ) +LedState MackieControlProtocol::stop_press (Button &) { session->request_stop(); return on; } -LedState MackieControlProtocol::stop_release( Button & button ) +LedState MackieControlProtocol::stop_release (Button &) { return session->transport_stopped(); } -LedState MackieControlProtocol::play_press( Button & button ) +LedState MackieControlProtocol::play_press (Button &) { session->request_transport_speed( 1.0 ); return on; } -LedState MackieControlProtocol::play_release( Button & button ) +LedState MackieControlProtocol::play_release (Button &) { return session->transport_rolling(); } -LedState MackieControlProtocol::record_press( Button & button ) +LedState MackieControlProtocol::record_press (Button &) { if ( session->get_record_enabled() ) session->disable_record( false ); @@ -1300,7 +1300,7 @@ LedState MackieControlProtocol::record_press( Button & button ) return on; } -LedState MackieControlProtocol::record_release( Button & button ) +LedState MackieControlProtocol::record_release (Button &) { if ( session->get_record_enabled() ) { @@ -1313,7 +1313,7 @@ LedState MackieControlProtocol::record_release( Button & button ) return off; } -LedState MackieControlProtocol::rewind_press( Button & button ) +LedState MackieControlProtocol::rewind_press (Button &) { _jog_wheel.push( JogWheel::speed ); _jog_wheel.transport_direction( -1 ); @@ -1321,7 +1321,7 @@ LedState MackieControlProtocol::rewind_press( Button & button ) return on; } -LedState MackieControlProtocol::rewind_release( Button & button ) +LedState MackieControlProtocol::rewind_release (Button &) { _jog_wheel.pop(); _jog_wheel.transport_direction( 0 ); @@ -1332,7 +1332,7 @@ LedState MackieControlProtocol::rewind_release( Button & button ) return off; } -LedState MackieControlProtocol::ffwd_press( Button & button ) +LedState MackieControlProtocol::ffwd_press (Button &) { _jog_wheel.push( JogWheel::speed ); _jog_wheel.transport_direction( 1 ); @@ -1340,7 +1340,7 @@ LedState MackieControlProtocol::ffwd_press( Button & button ) return on; } -LedState MackieControlProtocol::ffwd_release( Button & button ) +LedState MackieControlProtocol::ffwd_release (Button &) { _jog_wheel.pop(); _jog_wheel.transport_direction( 0 ); @@ -1351,83 +1351,83 @@ LedState MackieControlProtocol::ffwd_release( Button & button ) return off; } -LedState MackieControlProtocol::loop_press( Button & button ) +LedState MackieControlProtocol::loop_press (Button &) { session->request_play_loop( !session->get_play_loop() ); return on; } -LedState MackieControlProtocol::loop_release( Button & button ) +LedState MackieControlProtocol::loop_release (Button &) { return session->get_play_loop(); } -LedState MackieControlProtocol::punch_in_press( Button & button ) +LedState MackieControlProtocol::punch_in_press (Button &) { bool state = !session->config.get_punch_in(); session->config.set_punch_in( state ); return state; } -LedState MackieControlProtocol::punch_in_release( Button & button ) +LedState MackieControlProtocol::punch_in_release (Button &) { return session->config.get_punch_in(); } -LedState MackieControlProtocol::punch_out_press( Button & button ) +LedState MackieControlProtocol::punch_out_press (Button &) { bool state = !session->config.get_punch_out(); session->config.set_punch_out( state ); return state; } -LedState MackieControlProtocol::punch_out_release( Button & button ) +LedState MackieControlProtocol::punch_out_release (Button &) { return session->config.get_punch_out(); } -LedState MackieControlProtocol::home_press( Button & button ) +LedState MackieControlProtocol::home_press (Button &) { session->goto_start(); return on; } -LedState MackieControlProtocol::home_release( Button & button ) +LedState MackieControlProtocol::home_release (Button &) { return off; } -LedState MackieControlProtocol::end_press( Button & button ) +LedState MackieControlProtocol::end_press (Button &) { session->goto_end(); return on; } -LedState MackieControlProtocol::end_release( Button & button ) +LedState MackieControlProtocol::end_release (Button &) { return off; } -LedState MackieControlProtocol::clicking_press( Button & button ) +LedState MackieControlProtocol::clicking_press (Button &) { bool state = !Config->get_clicking(); Config->set_clicking( state ); return state; } -LedState MackieControlProtocol::clicking_release( Button & button ) +LedState MackieControlProtocol::clicking_release (Button &) { return Config->get_clicking(); } -LedState MackieControlProtocol::global_solo_press( Button & button ) +LedState MackieControlProtocol::global_solo_press (Button &) { bool state = !session->soloing(); session->set_all_solo ( state ); return state; } -LedState MackieControlProtocol::global_solo_release( Button & button ) +LedState MackieControlProtocol::global_solo_release (Button &) { return session->soloing(); } @@ -1529,7 +1529,7 @@ void MackieControlProtocol::notify_transport_state_changed() ///////////////////////////////////// // Bank Switching ///////////////////////////////////// -LedState MackieControlProtocol::left_press( Button & button ) +LedState MackieControlProtocol::left_press (Button &) { Sorted sorted = get_sorted_routes(); if ( sorted.size() > route_table.size() ) @@ -1550,12 +1550,12 @@ LedState MackieControlProtocol::left_press( Button & button ) } } -LedState MackieControlProtocol::left_release( Button & button ) +LedState MackieControlProtocol::left_release (Button &) { return off; } -LedState MackieControlProtocol::right_press( Button & button ) +LedState MackieControlProtocol::right_press (Button &) { Sorted sorted = get_sorted_routes(); if ( sorted.size() > route_table.size() ) @@ -1576,12 +1576,12 @@ LedState MackieControlProtocol::right_press( Button & button ) } } -LedState MackieControlProtocol::right_release( Button & button ) +LedState MackieControlProtocol::right_release (Button &) { return off; } -LedState MackieControlProtocol::channel_left_press( Button & button ) +LedState MackieControlProtocol::channel_left_press (Button &) { Sorted sorted = get_sorted_routes(); if ( sorted.size() > route_table.size() ) @@ -1595,12 +1595,12 @@ LedState MackieControlProtocol::channel_left_press( Button & button ) } } -LedState MackieControlProtocol::channel_left_release( Button & button ) +LedState MackieControlProtocol::channel_left_release (Button &) { return off; } -LedState MackieControlProtocol::channel_right_press( Button & button ) +LedState MackieControlProtocol::channel_right_press (Button &) { Sorted sorted = get_sorted_routes(); if ( sorted.size() > route_table.size() ) @@ -1614,7 +1614,7 @@ LedState MackieControlProtocol::channel_right_press( Button & button ) } } -LedState MackieControlProtocol::channel_right_release( Button & button ) +LedState MackieControlProtocol::channel_right_release (Button &) { return off; } @@ -1622,7 +1622,7 @@ LedState MackieControlProtocol::channel_right_release( Button & button ) ///////////////////////////////////// // Functions ///////////////////////////////////// -LedState MackieControlProtocol::marker_press( Button & button ) +LedState MackieControlProtocol::marker_press (Button &) { // cut'n'paste from LocationUI::add_new_location() string markername; @@ -1638,7 +1638,7 @@ LedState MackieControlProtocol::marker_press( Button & button ) return on; } -LedState MackieControlProtocol::marker_release( Button & button ) +LedState MackieControlProtocol::marker_release (Button &) { return off; } @@ -1690,29 +1690,29 @@ Mackie::LedState MackieControlProtocol::scrub_release( Mackie::Button & ) ; } -LedState MackieControlProtocol::drop_press( Button & button ) +LedState MackieControlProtocol::drop_press (Button &) { session->remove_last_capture(); return on; } -LedState MackieControlProtocol::drop_release( Button & button ) +LedState MackieControlProtocol::drop_release (Button &) { return off; } -LedState MackieControlProtocol::save_press( Button & button ) +LedState MackieControlProtocol::save_press (Button &) { session->save_state( "" ); return on; } -LedState MackieControlProtocol::save_release( Button & button ) +LedState MackieControlProtocol::save_release (Button &) { return off; } -LedState MackieControlProtocol::smpte_beats_press( Button & ) +LedState MackieControlProtocol::smpte_beats_press (Button &) { switch ( _timecode_type ) { diff --git a/libs/surfaces/mackie/mackie_control_protocol_poll.cc b/libs/surfaces/mackie/mackie_control_protocol_poll.cc index 2bf992f1b7..176225de55 100644 --- a/libs/surfaces/mackie/mackie_control_protocol_poll.cc +++ b/libs/surfaces/mackie/mackie_control_protocol_poll.cc @@ -192,7 +192,7 @@ void MackieControlProtocol::handle_port_inactive( SurfacePort * port ) // TODO all the rebuilding of surfaces and so on } -void MackieControlProtocol::handle_port_active( SurfacePort * port ) +void MackieControlProtocol::handle_port_active (SurfacePort *) { // no need to re-add port because it was already added // during the init phase. So just update the local surface @@ -213,7 +213,7 @@ void MackieControlProtocol::handle_port_active( SurfacePort * port ) update_surface(); } -void MackieControlProtocol::handle_port_init( Mackie::SurfacePort * sport ) +void MackieControlProtocol::handle_port_init (Mackie::SurfacePort *) { #ifdef DEBUG cout << "MackieControlProtocol::handle_port_init" << endl; diff --git a/libs/surfaces/mackie/mackie_jog_wheel.cc b/libs/surfaces/mackie/mackie_jog_wheel.cc index 4e61fc55c9..3cd9664fb1 100644 --- a/libs/surfaces/mackie/mackie_jog_wheel.cc +++ b/libs/surfaces/mackie/mackie_jog_wheel.cc @@ -28,23 +28,23 @@ JogWheel::State JogWheel::jog_wheel_state() const return scroll; } -void JogWheel::zoom_event( SurfacePort & port, Control & control, const ControlState & state ) +void JogWheel::zoom_event (SurfacePort &, Control &, const ControlState &) { } -void JogWheel::scrub_event( SurfacePort & port, Control & control, const ControlState & state ) +void JogWheel::scrub_event (SurfacePort &, Control &, const ControlState &) { } -void JogWheel::speed_event( SurfacePort & port, Control & control, const ControlState & state ) +void JogWheel::speed_event (SurfacePort &, Control &, const ControlState &) { } -void JogWheel::scroll_event( SurfacePort & port, Control & control, const ControlState & state ) +void JogWheel::scroll_event (SurfacePort &, Control &, const ControlState &) { } -void JogWheel::jog_event( SurfacePort & port, Control & control, const ControlState & state ) +void JogWheel::jog_event (SurfacePort &, Control &, const ControlState & state) { // TODO use current snap-to setting? switch ( jog_wheel_state() ) diff --git a/libs/surfaces/mackie/mackie_port.cc b/libs/surfaces/mackie/mackie_port.cc index d767c4c745..e3a302fe65 100644 --- a/libs/surfaces/mackie/mackie_port.cc +++ b/libs/surfaces/mackie/mackie_port.cc @@ -189,7 +189,7 @@ MidiByteArray MackiePort::host_connection_confirmation( const MidiByteArray & by return MidiByteArray( 2, 0x13, 0x00 ); } -void MackiePort::probe_emulation( const MidiByteArray & bytes ) +void MackiePort::probe_emulation (const MidiByteArray &) { #if 0 cout << "MackiePort::probe_emulation: " << bytes.size() << ", " << bytes << endl; @@ -330,7 +330,7 @@ bool MackiePort::wait_for_init() return SurfacePort::active(); } -void MackiePort::handle_midi_sysex (MIDI::Parser & parser, MIDI::byte * raw_bytes, size_t count ) +void MackiePort::handle_midi_sysex (MIDI::Parser &, MIDI::byte * raw_bytes, size_t count ) { MidiByteArray bytes( count, raw_bytes ); #ifdef PORT_DEBUG @@ -429,7 +429,7 @@ bool MackiePort::handle_control_timeout_event ( Control * control ) // converts midi messages into control_event signals // it might be worth combining this with lookup_control // because they have similar logic flows. -void MackiePort::handle_midi_any (MIDI::Parser & parser, MIDI::byte * raw_bytes, size_t count ) +void MackiePort::handle_midi_any (MIDI::Parser &, MIDI::byte * raw_bytes, size_t count ) { #ifdef DEBUG MidiByteArray bytes( count, raw_bytes ); diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h index 5305fe7eb8..05983cbfa2 100644 --- a/libs/surfaces/mackie/surface.h +++ b/libs/surfaces/mackie/surface.h @@ -86,7 +86,7 @@ public: public: /// display an indicator of the first switched-in Route. Do nothing by default. - virtual void display_bank_start( SurfacePort &, MackieMidiBuilder &, uint32_t current_bank ) {}; + virtual void display_bank_start( SurfacePort &, MackieMidiBuilder &, uint32_t /*current_bank*/ ) {}; /// called from MackieControlPRotocol::zero_all to turn things off virtual void zero_all( SurfacePort &, MackieMidiBuilder & ) {}; @@ -96,7 +96,7 @@ public: virtual void blank_jog_ring( SurfacePort &, MackieMidiBuilder & ) {}; virtual bool has_timecode_display() const = 0; - virtual void display_timecode( SurfacePort &, MackieMidiBuilder &, const std::string & timecode, const std::string & timecode_last ) {}; + virtual void display_timecode( SurfacePort &, MackieMidiBuilder &, const std::string & /*timecode*/, const std::string & /*timecode_last*/) {}; public: /** |