summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/midi_model.h6
-rw-r--r--libs/ardour/ardour/smf_source.h1
-rw-r--r--libs/ardour/ardour/sndfilesource.h1
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h
index ea915d0a45..39987dfe7a 100644
--- a/libs/ardour/ardour/midi_model.h
+++ b/libs/ardour/ardour/midi_model.h
@@ -63,7 +63,7 @@ public:
*/
class MidiModel : public boost::noncopyable, public Automatable {
public:
- MidiModel(MidiSource *s, size_t size=0);
+ MidiModel(MidiSource* s, size_t size=0);
void write_lock();
void write_unlock();
@@ -91,7 +91,6 @@ public:
inline size_t n_notes() const { return _notes.size(); }
inline bool empty() const { return _notes.size() == 0 && _controls.size() == 0; }
-
inline static bool note_time_comparator (const boost::shared_ptr<const Note> a,
const boost::shared_ptr<const Note> b) {
return a->time() < b->time();
@@ -149,7 +148,8 @@ public:
void set_edited(bool yn) { _edited = yn; }
bool write_to(boost::shared_ptr<MidiSource> source);
- // MidiModel doesn't use the normal AutomationList serialisation code, as CC data is in the .mid
+ // MidiModel doesn't use the normal AutomationList serialisation code
+ // since controller data is stored in the .mid
XMLNode& get_state();
int set_state(const XMLNode&) { return 0; }
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index dd8fd61926..9e215bf5a2 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -110,6 +110,7 @@ class SMFSource : public MidiSource {
bool writable() const { return _flags & Writable; }
int open();
+ void close();
void seek_to_end();
void write_footer();
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index dc83fc6ec1..4ad967c132 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -78,7 +78,6 @@ class SndFileSource : public AudioFileSource {
void init ();
int open();
- void close();
int setup_broadcast_info (nframes_t when, struct tm&, time_t);
/* destructive */