diff options
-rw-r--r-- | libs/evoral/evoral/LibSMF.hpp | 4 | ||||
-rw-r--r-- | libs/evoral/evoral/MIDIFile.hpp (renamed from libs/evoral/evoral/StandardMIDIFile.hpp) | 4 | ||||
-rw-r--r-- | libs/evoral/evoral/SMF.hpp | 4 | ||||
-rw-r--r-- | libs/evoral/src/LibSMF.cpp | 6 | ||||
-rw-r--r-- | libs/evoral/src/SMF.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/libs/evoral/evoral/LibSMF.hpp b/libs/evoral/evoral/LibSMF.hpp index 0c3386b40c..da90814bf3 100644 --- a/libs/evoral/evoral/LibSMF.hpp +++ b/libs/evoral/evoral/LibSMF.hpp @@ -21,7 +21,7 @@ #define EVORAL_LIB_SMF_HPP #include <cassert> -#include "evoral/StandardMIDIFile.hpp" +#include "evoral/MIDIFile.hpp" struct smf_struct; struct smf_track_struct; @@ -36,7 +36,7 @@ template<typename Time> class EventRingBuffer; /** Standard Midi File (Type 0) */ template<typename Time> -class LibSMF : public StandardMIDIFile<Time> { +class LibSMF : public MIDIFile<Time> { public: LibSMF() : _last_ev_time(0), _smf(0), _smf_track(0), _empty(true) {}; virtual ~LibSMF(); diff --git a/libs/evoral/evoral/StandardMIDIFile.hpp b/libs/evoral/evoral/MIDIFile.hpp index a3359368f6..093267041b 100644 --- a/libs/evoral/evoral/StandardMIDIFile.hpp +++ b/libs/evoral/evoral/MIDIFile.hpp @@ -28,12 +28,12 @@ namespace Evoral { template<typename Time> class Event; template<typename Time> class EventRingBuffer; -#define THROW_FILE_ERROR throw(typename StandardMIDIFile<Time>::FileError) +#define THROW_FILE_ERROR throw(typename MIDIFile<Time>::FileError) /** Standard MIDI File interface */ template<typename Time> -class StandardMIDIFile { +class MIDIFile { public: class FileError : public std::exception { const char* what() const throw() { return "libsmf error"; } diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/SMF.hpp index 4a154cba0f..23a317bb28 100644 --- a/libs/evoral/evoral/SMF.hpp +++ b/libs/evoral/evoral/SMF.hpp @@ -19,7 +19,7 @@ #ifndef EVORAL_SMF_HPP #define EVORAL_SMF_HPP -#include "evoral/StandardMIDIFile.hpp" +#include "evoral/MIDIFile.hpp" namespace Evoral { @@ -30,7 +30,7 @@ template<typename Time> class EventRingBuffer; /** Standard Midi File (Type 0) */ template<typename Time> -class SMF : public StandardMIDIFile<Time> { +class SMF : public MIDIFile<Time> { public: SMF(); virtual ~SMF(); diff --git a/libs/evoral/src/LibSMF.cpp b/libs/evoral/src/LibSMF.cpp index 9f6f260b9f..127aa9699c 100644 --- a/libs/evoral/src/LibSMF.cpp +++ b/libs/evoral/src/LibSMF.cpp @@ -56,7 +56,7 @@ LibSMF<Time>::open(const std::string& path) THROW_FILE_ERROR if (!_smf) { _smf = smf_new(); if (smf_set_ppqn(_smf, _ppqn) != 0) { - throw typename StandardMIDIFile<Time>::FileError(); + throw typename MIDIFile<Time>::FileError(); } if(_smf == NULL) { @@ -81,7 +81,7 @@ LibSMF<Time>::close() THROW_FILE_ERROR assert(false); if (_smf) { if (smf_save(_smf, _path.c_str()) != 0) { - throw typename StandardMIDIFile<Time>::FileError(); + throw typename MIDIFile<Time>::FileError(); } smf_delete(_smf); _smf = 0; @@ -185,7 +185,7 @@ void LibSMF<Time>::end_write() THROW_FILE_ERROR { if (smf_save(_smf, _path.c_str()) != 0) - throw typename StandardMIDIFile<Time>::FileError(); + throw typename MIDIFile<Time>::FileError(); } template class LibSMF<double>; diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/SMF.cpp index 0278bed490..fa62ab8eeb 100644 --- a/libs/evoral/src/SMF.cpp +++ b/libs/evoral/src/SMF.cpp @@ -312,7 +312,7 @@ SMF<Time>::begin_write(FrameTime start_frame) template<typename Time> void -SMF<Time>::end_write() throw(typename StandardMIDIFile<Time>::FileError) +SMF<Time>::end_write() throw(typename MIDIFile<Time>::FileError) { flush_header(); flush_footer(); |