summaryrefslogtreecommitdiffstats
path: root/src/SMFReader.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-01-08 16:05:32 +0000
committerDavid Robillard <d@drobilla.net>2011-01-08 16:05:32 +0000
commitba3e966984bc8864bccb247daa9d78d5165e13bf (patch)
treef1d4a10a2989772298f6e57ddfdb847b259f54af /src/SMFReader.cpp
parenta6a719577de47ad695b568b7bc451b9475104a28 (diff)
downloadraul-ba3e966984bc8864bccb247daa9d78d5165e13bf.tar.gz
raul-ba3e966984bc8864bccb247daa9d78d5165e13bf.tar.bz2
raul-ba3e966984bc8864bccb247daa9d78d5165e13bf.zip
Code clean-up (cpplint).
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@2796 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/SMFReader.cpp')
-rw-r--r--src/SMFReader.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/SMFReader.cpp b/src/SMFReader.cpp
index 6fda04a..5a20470 100644
--- a/src/SMFReader.cpp
+++ b/src/SMFReader.cpp
@@ -15,15 +15,18 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <glib.h>
+
#include <cstdio>
#include <cassert>
#include <cstring>
-#include <glib.h>
+#include <string>
+
#include "raul/log.hpp"
#include "raul/SMFReader.hpp"
#include "raul/midi_events.h"
-using namespace std;
+using std::endl;
namespace Raul {
@@ -90,10 +93,10 @@ SMFReader::~SMFReader()
bool
-SMFReader::open(const std::string& filename) throw (logic_error, UnsupportedTime)
+SMFReader::open(const std::string& filename) throw (std::logic_error, UnsupportedTime)
{
if (_fd)
- throw logic_error("Attempt to start new read while write in progress.");
+ throw std::logic_error("Attempt to start new read while write in progress.");
info << "Opening SMF file " << filename << " for reading." << endl;
@@ -148,10 +151,10 @@ bool
SMFReader::seek_to_track(unsigned track) throw (std::logic_error)
{
if (track == 0)
- throw logic_error("Seek to track 0 out of range (must be >= 1)");
+ throw std::logic_error("Seek to track 0 out of range (must be >= 1)");
if (!_fd)
- throw logic_error("Attempt to seek to track on unopened SMF file.");
+ throw std::logic_error("Attempt to seek to track on unopened SMF file.");
unsigned track_pos = 0;
@@ -210,7 +213,7 @@ SMFReader::read_event(size_t buf_len,
throw (std::logic_error, PrematureEOF, CorruptFile)
{
if (_track == 0)
- throw logic_error("Attempt to read from unopened SMF file");
+ throw std::logic_error("Attempt to read from unopened SMF file");
if (!_fd || feof(_fd)) {
return -1;