diff options
author | Robin Gareus <robin@gareus.org> | 2015-10-05 16:17:49 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-10-05 16:17:49 +0200 |
commit | 22b07e0233a29d9633ffa825a79503befaf2e16e (patch) | |
tree | 1d8b06056f8e12197158f5d906319767d3dedda5 /libs/midi++2/midi++ | |
parent | e11ba7b79d68bc1070b170236c22123966d7bcc3 (diff) |
NOOP, remove trailing tabs/whitespace.
Diffstat (limited to 'libs/midi++2/midi++')
-rw-r--r-- | libs/midi++2/midi++/channel.h | 10 | ||||
-rw-r--r-- | libs/midi++2/midi++/ipmidi_port.h | 2 | ||||
-rw-r--r-- | libs/midi++2/midi++/midnam_patch.h | 46 | ||||
-rw-r--r-- | libs/midi++2/midi++/mmc.h | 26 | ||||
-rw-r--r-- | libs/midi++2/midi++/parser.h | 12 | ||||
-rw-r--r-- | libs/midi++2/midi++/port.h | 6 |
6 files changed, 51 insertions, 51 deletions
diff --git a/libs/midi++2/midi++/channel.h b/libs/midi++2/midi++/channel.h index d397c99ea0..6f4928209a 100644 --- a/libs/midi++2/midi++/channel.h +++ b/libs/midi++2/midi++/channel.h @@ -79,19 +79,19 @@ class LIBMIDIPP_API Channel : public PBD::ScopedConnectionList { bool all_notes_off (timestamp_t timestamp) { return channel_msg (MIDI::controller, 123, 0, timestamp); } - + bool control (byte id, byte value, timestamp_t timestamp) { return channel_msg (MIDI::controller, id, value, timestamp); } - + bool note_on (byte note, byte velocity, timestamp_t timestamp) { return channel_msg (MIDI::on, note, velocity, timestamp); } - + bool note_off (byte note, byte velocity, timestamp_t timestamp) { return channel_msg (MIDI::off, note, velocity, timestamp); } - + bool aftertouch (byte value, timestamp_t timestamp) { return channel_msg (MIDI::chanpress, value, 0, timestamp); } @@ -140,7 +140,7 @@ class LIBMIDIPP_API Channel : public PBD::ScopedConnectionList { size_t _notes_on; void reset (timestamp_t timestamp, framecnt_t nframes, bool notes_off = true); - + void process_note_off (Parser &, EventTwoBytes *); void process_note_on (Parser &, EventTwoBytes *); void process_controller (Parser &, EventTwoBytes *); diff --git a/libs/midi++2/midi++/ipmidi_port.h b/libs/midi++2/midi++/ipmidi_port.h index 9e37253e52..313208892f 100644 --- a/libs/midi++2/midi++/ipmidi_port.h +++ b/libs/midi++2/midi++/ipmidi_port.h @@ -69,7 +69,7 @@ class LIBMIDIPP_API IPMIDIPort : public Port { static const int lowest_ipmidi_port_default = 21928; -private: +private: int sockin; int sockout; struct sockaddr_in addrout; diff --git a/libs/midi++2/midi++/midnam_patch.h b/libs/midi++2/midi++/midnam_patch.h index 45a251457e..e252e76fe1 100644 --- a/libs/midi++2/midi++/midnam_patch.h +++ b/libs/midi++2/midi++/midnam_patch.h @@ -48,18 +48,18 @@ public: : _bank(std::max(0, std::min(bank_num, 16383))) , _program(std::max(0, std::min(program_num, 127))) {} - + inline PatchPrimaryKey& operator=(const PatchPrimaryKey& id) { _bank = id._bank; _program = id._program; return *this; } - + inline bool operator==(const PatchPrimaryKey& id) const { return (_bank == id._bank && _program == id._program); } - + /** Strict weak ordering. */ inline bool operator<(const PatchPrimaryKey& id) const { if (_bank < id._bank) { @@ -82,7 +82,7 @@ private: }; class PatchBank; - + class LIBMIDIPP_API Patch { public: @@ -92,7 +92,7 @@ public: const std::string& name() const { return _name; } void set_name(const std::string& name) { _name = name; } - + const std::string& note_list_name() const { return _note_list_name; } uint8_t program_number() const { return _id.program(); } @@ -154,17 +154,17 @@ public: const std::string& name() const { return _name; } void set_name(const std::string& name) { _name = name; } - + const PatchBanks& patch_banks() const { return _patch_banks; } bool available_for_channel(uint8_t channel) const { return _available_for_channels.find(channel) != _available_for_channels.end(); } - + boost::shared_ptr<Patch> find_patch(const PatchPrimaryKey& key) { return _patch_map[key]; } - + boost::shared_ptr<Patch> previous_patch(const PatchPrimaryKey& key) { for (PatchList::const_iterator i = _patch_list.begin(); i != _patch_list.end(); @@ -176,10 +176,10 @@ public: } } } - + return boost::shared_ptr<Patch>(); } - + boost::shared_ptr<Patch> next_patch(const PatchPrimaryKey& key) { for (PatchList::const_iterator i = _patch_list.begin(); i != _patch_list.end(); @@ -192,7 +192,7 @@ public: } } } - + return boost::shared_ptr<Patch>(); } @@ -378,16 +378,16 @@ public: const std::string& name() const { return _name; } void set_name(const std::string& name) { _name = name; } - + XMLNode& get_state (void); int set_state (const XMLTree&, const XMLNode&); - + /// Note: channel here is 0-based while in the MIDNAM-file it's 1-based const std::string& channel_name_set_name_by_channel(uint8_t channel) { assert(channel <= 15); return _channel_name_set_assignments[channel]; } - + private: /// array index = channel number /// string contents = name of channel name set @@ -408,13 +408,13 @@ public: typedef std::map<std::string, boost::shared_ptr<ControlNameList> > ControlNameLists; typedef std::map<std::string, boost::shared_ptr<ValueNameList> > ValueNameLists; typedef std::map<std::string, PatchNameList> PatchNameLists; - + MasterDeviceNames() {}; virtual ~MasterDeviceNames() {}; - + const std::string& manufacturer() const { return _manufacturer; } void set_manufacturer(const std::string& manufacturer) { _manufacturer = manufacturer; } - + const Models& models() const { return _models; } void set_models(const Models some_models) { _models = some_models; } @@ -427,7 +427,7 @@ public: uint8_t number); const CustomDeviceModeNames& custom_device_mode_names() const { return _custom_device_mode_names; } - + boost::shared_ptr<CustomDeviceMode> custom_device_mode_by_name(const std::string& mode_name); boost::shared_ptr<ChannelNameSet> channel_name_set_by_channel(const std::string& mode, uint8_t channel); boost::shared_ptr<Patch> find_patch(const std::string& mode, uint8_t channel, const PatchPrimaryKey& key); @@ -445,7 +445,7 @@ public: XMLNode& get_state (void); int set_state (const XMLTree&, const XMLNode&); - + private: std::string _manufacturer; Models _models; @@ -463,20 +463,20 @@ class LIBMIDIPP_API MIDINameDocument public: // Maps Model names to MasterDeviceNames typedef std::map<std::string, boost::shared_ptr<MasterDeviceNames> > MasterDeviceNamesList; - + MIDINameDocument() {} MIDINameDocument(const std::string& filename); virtual ~MIDINameDocument() {}; const std::string& author() const { return _author; } void set_author(const std::string& author) { _author = author; } - + boost::shared_ptr<MasterDeviceNames> master_device_names(const std::string& model); const MasterDeviceNamesList& master_device_names_by_model() const { return _master_device_names_list; } - + const MasterDeviceNames::Models& all_models() const { return _all_models; } - + XMLNode& get_state (void); int set_state (const XMLTree&, const XMLNode&); diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h index 3529031caf..caf1605c29 100644 --- a/libs/midi++2/midi++/mmc.h +++ b/libs/midi++2/midi++/mmc.h @@ -60,10 +60,10 @@ class LIBMIDIPP_API MachineControl cmdChase = 0xB, cmdCommandErrorReset = 0xC, cmdMmcReset = 0xD, - + cmdIllegalMackieJogStart = 0x20, cmdIllegalMackieJogStop = 0x21, - + cmdWrite = 0x40, cmdMaskedWrite = 0x41, cmdRead = 0x42, @@ -93,14 +93,14 @@ class LIBMIDIPP_API MachineControl cmdWait = 0x7C, cmdResume = 0x7F }; - + MachineControl (); void set_ports (MIDI::Port* input, MIDI::Port* output); Port* input_port() { return _input_port; } Port* output_port() { return _output_port; } - + void set_receive_device_id (byte id); void set_send_device_id (byte id); byte receive_device_id () const { return _receive_device_id; } @@ -114,7 +114,7 @@ class LIBMIDIPP_API MachineControl /* Signals to connect to if you want to run "callbacks" when certain MMC commands are received. */ - + MMCSignal Stop; MMCSignal Play; MMCSignal DeferredPlay; @@ -159,7 +159,7 @@ class LIBMIDIPP_API MachineControl /* The second argument is the shuttle speed, the third is true if the direction is "forwards", false for "reverse" */ - + PBD::Signal3<void,MachineControl&,float,bool> Shuttle; /* The second argument specifies the desired track record enabled @@ -168,14 +168,14 @@ class LIBMIDIPP_API MachineControl PBD::Signal3<void,MachineControl &,size_t,bool> TrackRecordStatusChange; - + /* The second argument specifies the desired track record enabled status. */ PBD::Signal3<void,MachineControl &,size_t,bool> TrackMuteChange; - + /* The second argument points to a byte array containing the locate target value in MMC Standard Time Code format (5 bytes, roughly: hrs/mins/secs/frames/subframes) @@ -184,13 +184,13 @@ class LIBMIDIPP_API MachineControl PBD::Signal2<void,MachineControl &, const byte *> Locate; /* The second argument is the number of steps to jump */ - + PBD::Signal2<void,MachineControl &, int> Step; #define MMC_NTRACKS 48 /* note: these are not currently in use */ - + byte updateRate; byte responseError; byte commandError; @@ -261,7 +261,7 @@ class LIBMIDIPP_API MachineControl byte responseSegment; byte wait; byte resume; - + private: byte _receive_device_id; byte _send_device_id; @@ -276,7 +276,7 @@ class LIBMIDIPP_API MachineControl int do_locate (byte *, size_t len); int do_step (byte *, size_t len); int do_shuttle (byte *, size_t len); - + void write_track_status (byte *, size_t len, byte reg); void spp_start (); void spp_continue (); @@ -293,7 +293,7 @@ public: MachineControlCommand () : _command (MachineControl::Command (0)) {} MachineControlCommand (MachineControl::Command); MachineControlCommand (Timecode::Time); - + MIDI::byte* fill_buffer (MachineControl *mmc, MIDI::byte *) const; private: diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h index 05d674375c..0f2ecf49fd 100644 --- a/libs/midi++2/midi++/parser.h +++ b/libs/midi++2/midi++/parser.h @@ -50,12 +50,12 @@ class LIBMIDIPP_API Parser { message the next time ::scanner() parses such a message. It should therefore be set before every byte passed into ::scanner(). */ - + framecnt_t get_timestamp() const { return _timestamp; } void set_timestamp (const framecnt_t timestamp) { _timestamp = timestamp; } /* signals that anyone can connect to */ - + BankSignal bank_change; TwoByteSignal note_on; TwoByteSignal note_off; @@ -124,7 +124,7 @@ class LIBMIDIPP_API Parser { MTC_Status mtc_running() const { return _mtc_running; } const byte *mtc_current() const { return _mtc_time; } bool mtc_locked() const { return _mtc_locked; } - + PBD::Signal3<void, Parser &, int, framecnt_t> mtc_qtr; PBD::Signal3<void, const byte *, bool, framecnt_t> mtc_time; PBD::Signal1<void, MTC_Status> mtc_status; @@ -135,10 +135,10 @@ class LIBMIDIPP_API Parser { } void reset_mtc_state (); - + private: /* tracing */ - + std::ostream *trace_stream; std::string trace_prefix; void trace_event (Parser &p, byte *msg, size_t len); @@ -171,7 +171,7 @@ class LIBMIDIPP_API Parser { MTC_Status _mtc_running; bool _mtc_locked; byte last_qtr_frame; - + framecnt_t _timestamp; ParseState pre_variable_state; diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h index 1f85b53cd4..6d933f6a6d 100644 --- a/libs/midi++2/midi++/port.h +++ b/libs/midi++2/midi++/port.h @@ -46,7 +46,7 @@ class LIBMIDIPP_API Port { IsInput = 0x1, /* MUST MATCH JACK's JackPortIsInput */ IsOutput = 0x2, /* MUST MATCH JACK's JackPortIsOutput */ }; - + Port (std::string const &, Flags); Port (const XMLNode&); virtual ~Port (); @@ -99,11 +99,11 @@ class LIBMIDIPP_API Port { Channel *channel (channel_t chn) { return _channel[chn&0x7F]; } - + Parser* parser () { return _parser; } - + const char *name () const { return _tagname.c_str(); } bool ok () const { return _ok; } |