ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Remove some unused parameters. 

git-svn-id: svn://localhost/ardour2/branches/3.0@11917 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-04-11 20:21:00 +00:00
parent 5ae258e23b
commit 4b63b88e35
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/session.h
View File

@ -1126,9 +1126,9 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
/* MIDI Machine Control */
void spp_start (MIDI::Parser&, framepos_t timestamp);
void spp_continue (MIDI::Parser&, framepos_t timestamp);
void spp_stop (MIDI::Parser&, framepos_t timestamp);
void spp_start ();
void spp_continue ();
void spp_stop ();
void mmc_deferred_play (MIDI::MachineControl &);
void mmc_stop (MIDI::MachineControl &);

8
libs/ardour/session_midi.cc
View File

@ -91,7 +91,7 @@ Session::setup_midi_control ()
}
void
Session::spp_start (Parser &, framepos_t /*timestamp*/)
Session::spp_start ()
{
if (Config->get_mmc_control ()) {
request_transport_speed (1.0);
@ -99,13 +99,13 @@ Session::spp_start (Parser &, framepos_t /*timestamp*/)
}
void
Session::spp_continue (Parser& ignored, framepos_t timestamp)
Session::spp_continue ()
{
spp_start (ignored, timestamp);
spp_start ();
}
void
Session::spp_stop (Parser&, framepos_t /*timestamp*/)
Session::spp_stop ()
{
if (Config->get_mmc_control ()) {
request_stop ();

6
libs/ardour/session_state.cc
View File

@ -3643,9 +3643,9 @@ Session::setup_midi_machine_control ()
/* also handle MIDI SPP because its so common */
mmc->SPPStart.connect_same_thread (*this, boost::bind (&Session::spp_start, this, _1, _2));
mmc->SPPContinue.connect_same_thread (*this, boost::bind (&Session::spp_continue, this, _1, _2));
mmc->SPPStop.connect_same_thread (*this, boost::bind (&Session::spp_stop, this, _1, _2));
mmc->SPPStart.connect_same_thread (*this, boost::bind (&Session::spp_start, this));
mmc->SPPContinue.connect_same_thread (*this, boost::bind (&Session::spp_continue, this));
mmc->SPPStop.connect_same_thread (*this, boost::bind (&Session::spp_stop, this));
}
boost::shared_ptr<Controllable>

12
libs/midi++2/midi++/mmc.h
View File

@ -145,9 +145,9 @@ class MachineControl
MMCSignal Wait;
MMCSignal Resume;
TimestampedSignal SPPStart;
TimestampedSignal SPPContinue;
TimestampedSignal SPPStop;
PBD::Signal0<void> SPPStart;
PBD::Signal0<void> SPPContinue;
PBD::Signal0<void> SPPStop;
/* The second argument is the shuttle speed, the third is
true if the direction is "forwards", false for "reverse"
@ -271,9 +271,9 @@ class MachineControl
int do_shuttle (byte *, size_t len);
void write_track_status (byte *, size_t len, byte reg);
void spp_start (Parser&, framecnt_t);
void spp_continue (Parser&, framecnt_t);
void spp_stop (Parser&, framecnt_t);
void spp_start ();
void spp_continue ();
void spp_stop ();
};
/** Class to describe a MIDI machine control command to be sent.

18
libs/midi++2/mmc.cc
View File

@ -206,9 +206,9 @@ MachineControl::MachineControl (Manager* m, jack_client_t* jack)
_output_port = m->add_port (new Port ("MMC out", Port::IsOutput, jack));
_input_port->parser()->mmc.connect_same_thread (port_connections, boost::bind (&MachineControl::process_mmc_message, this, _1, _2, _3));
_input_port->parser()->start.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_start, this, _1, _2));
_input_port->parser()->contineu.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_continue, this, _1, _2));
_input_port->parser()->stop.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_stop, this, _1, _2));
_input_port->parser()->start.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_start, this));
_input_port->parser()->contineu.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_continue, this));
_input_port->parser()->stop.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_stop, this));
}
void
@ -649,21 +649,21 @@ MachineControl::send (MachineControlCommand const & c)
}
void
MachineControl::spp_start (Parser& parser, framecnt_t timestamp)
MachineControl::spp_start ()
{
SPPStart (parser, timestamp); /* EMIT SIGNAL */
SPPStart (); /* EMIT SIGNAL */
}
void
MachineControl::spp_continue (Parser& parser, framecnt_t timestamp)
MachineControl::spp_continue ()
{
SPPContinue (parser, timestamp); /* EMIT SIGNAL */
SPPContinue (); /* EMIT SIGNAL */
}
void
MachineControl::spp_stop (Parser& parser, framecnt_t timestamp)
MachineControl::spp_stop ()
{
SPPStop (parser, timestamp); /* EMIT SIGNAL */
SPPStop (); /* EMIT SIGNAL */
}
MachineControlCommand::MachineControlCommand (MachineControl::Command c)