summaryrefslogtreecommitdiff
path: root/libs/evoral
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-10-04 14:51:05 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2015-10-04 14:51:05 -0400
commit4dc63966f0872efe768dad61eb9b8785d06b92d1 (patch)
treee54104d57d6c2da7840979181368151fd0819c96 /libs/evoral
parent297e80e020da94a56984b20782584bb1dd96ea34 (diff)
globally remove all trailing whitespace from ardour code base.
Paul Davis was responsible for introducing almost all of this.
Diffstat (limited to 'libs/evoral')
-rw-r--r--libs/evoral/evoral/visibility.h2
-rw-r--r--libs/evoral/src/libsmf/smf.h26
-rw-r--r--libs/evoral/src/libsmf/smf_load.c2
-rw-r--r--libs/evoral/src/libsmf/smf_private.h2
-rw-r--r--libs/evoral/src/libsmf/smf_save.c2
-rw-r--r--libs/evoral/src/libsmf/smf_tempo.c2
6 files changed, 18 insertions, 18 deletions
diff --git a/libs/evoral/evoral/visibility.h b/libs/evoral/evoral/visibility.h
index dd4fe1ff64..6c6f3825d7 100644
--- a/libs/evoral/evoral/visibility.h
+++ b/libs/evoral/evoral/visibility.h
@@ -44,7 +44,7 @@
#else
#define LIBEVORAL_API LIBEVORAL_DLL_IMPORT
#define LIBEVORAL_TEMPLATE_API LIBEVORAL_TEMPLATE_DLL_IMPORT
- #endif
+ #endif
#define LIBEVORAL_LOCAL LIBEVORAL_DLL_LOCAL
#endif
diff --git a/libs/evoral/src/libsmf/smf.h b/libs/evoral/src/libsmf/smf.h
index e5b76eedab..194319d933 100644
--- a/libs/evoral/src/libsmf/smf.h
+++ b/libs/evoral/src/libsmf/smf.h
@@ -39,16 +39,16 @@
* Tracks contain zero or more events. Libsmf doesn't care about actual MIDI data, as long
* as it is valid from the MIDI specification point of view - it may be realtime message,
* SysEx, whatever.
- *
+ *
* The only field in smf_t, smf_track_t, smf_event_t and smf_tempo_t structures your
* code may modify is event->midi_buffer and event->midi_buffer_length. Do not modify
* other fields, _ever_. You may read them, though. Do not declare static instances
* of these types, i.e. never do something like this: "smf_t smf;". Always use
* "smf_t *smf = smf_new();". The same applies to smf_track_t and smf_event_t.
- *
+ *
* Say you want to load a Standard MIDI File (.mid) file and play it back somehow.
* This is (roughly) how you do this:
- *
+ *
* \code
* smf_t *smf;
* smf_event_t *event;
@@ -58,11 +58,11 @@
* Whoops, something went wrong.
* return;
* }
- *
+ *
* while ((event = smf_get_next_event(smf)) != NULL) {
* if (smf_event_is_metadata(event))
* continue;
- *
+ *
* wait until event->time_seconds.
* feed_to_midi_output(event->midi_buffer, event->midi_buffer_length);
* }
@@ -70,9 +70,9 @@
* smf_delete(smf);
*
* \endcode
- *
+ *
* Saving works like this:
- *
+ *
* \code
*
* smf_t *smf;
@@ -84,27 +84,27 @@
* Whoops.
* return;
* }
- *
+ *
* for (int i = 1; i <= number of tracks; i++) {
* track = smf_track_new();
* if (track == NULL) {
* Whoops.
* return;
* }
- *
+ *
* smf_add_track(smf, track);
- *
+ *
* for (int j = 1; j <= number of events you want to put into this track; j++) {
* event = smf_event_new_from_pointer(your MIDI message, message length);
* if (event == NULL) {
* Whoops.
* return;
* }
- *
+ *
* smf_track_add_event_seconds(track, event, seconds since start of the song);
* }
* }
- *
+ *
* ret = smf_save(smf, file_name);
* if (ret) {
* Whoops, saving failed for some reason.
@@ -386,7 +386,7 @@ int smf_event_is_textual(const smf_event_t *event) WARN_UNUSED_RESULT;
char *smf_event_decode(const smf_event_t *event) WARN_UNUSED_RESULT;
char *smf_event_extract_text(const smf_event_t *event) WARN_UNUSED_RESULT;
-/* Routines for dealing with Variable Length Quantities (VLQ's).
+/* Routines for dealing with Variable Length Quantities (VLQ's).
Slightly odd names reflect original static names within libsmf
*/
int smf_format_vlq (unsigned char *buf, int length, unsigned long value);
diff --git a/libs/evoral/src/libsmf/smf_load.c b/libs/evoral/src/libsmf/smf_load.c
index eeedcc3da9..96b36fdbb5 100644
--- a/libs/evoral/src/libsmf/smf_load.c
+++ b/libs/evoral/src/libsmf/smf_load.c
@@ -612,7 +612,7 @@ error:
/**
* Takes "len" characters starting in "buf", making sure it does not access past the length of the buffer,
* and makes ordinary, zero-terminated string from it. May return NULL if there was any problem.
- */
+ */
static char *
make_string(const unsigned char *buf, const size_t buffer_length, uint32_t len)
{
diff --git a/libs/evoral/src/libsmf/smf_private.h b/libs/evoral/src/libsmf/smf_private.h
index f415eac9da..3f7bb2940d 100644
--- a/libs/evoral/src/libsmf/smf_private.h
+++ b/libs/evoral/src/libsmf/smf_private.h
@@ -51,7 +51,7 @@
/** SMF chunk header, used only by smf_load.c and smf_save.c. */
struct chunk_header_struct {
char id[4];
- uint32_t length;
+ uint32_t length;
} ATTRIBUTE_PACKED;
/** SMF chunk, used only by smf_load.c and smf_save.c. */
diff --git a/libs/evoral/src/libsmf/smf_save.c b/libs/evoral/src/libsmf/smf_save.c
index 937409ae36..7c5747a3d5 100644
--- a/libs/evoral/src/libsmf/smf_save.c
+++ b/libs/evoral/src/libsmf/smf_save.c
@@ -210,7 +210,7 @@ smf_event_new_textual(int type, const char *text)
g_critical("Cannot allocate MIDI buffer structure: %s", strerror(errno));
smf_event_delete(event);
- return (NULL);
+ return (NULL);
}
event->midi_buffer[0] = 0xFF;
diff --git a/libs/evoral/src/libsmf/smf_tempo.c b/libs/evoral/src/libsmf/smf_tempo.c
index f3e3f7fc1b..fb38ad0933 100644
--- a/libs/evoral/src/libsmf/smf_tempo.c
+++ b/libs/evoral/src/libsmf/smf_tempo.c
@@ -331,7 +331,7 @@ smf_get_last_tempo(const smf_t *smf)
}
/**
- * \internal
+ * \internal
*
* Remove all smf_tempo_t structures from SMF.
*/