summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-05-18 15:52:39 +0000
committerDavid Robillard <d@drobilla.net>2011-05-18 15:52:39 +0000
commit7bd4febfdb799cd359a380d23640654f476dadae (patch)
tree7acf0526548382e3768b45628a47f094120b7724 /src
parent3a1a098d7d41468a74862777d3085f537fb6b894 (diff)
downloadraul-7bd4febfdb799cd359a380d23640654f476dadae.tar.gz
raul-7bd4febfdb799cd359a380d23640654f476dadae.tar.bz2
raul-7bd4febfdb799cd359a380d23640654f476dadae.zip
Strip double blank lines.
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@3279 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/Configuration.cpp6
-rw-r--r--src/Maid.cpp4
-rw-r--r--src/Path.cpp9
-rw-r--r--src/SMFReader.cpp9
-rw-r--r--src/SMFWriter.cpp12
-rw-r--r--src/Symbol.cpp3
-rw-r--r--src/Thread.cpp6
-rw-r--r--src/log.cpp4
8 files changed, 0 insertions, 53 deletions
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index e1d8377..baf4e2a 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -25,7 +25,6 @@ using std::string;
namespace Raul {
-
/** Add a configuration option.
*
* @param name Long name (without leading "--")
@@ -50,7 +49,6 @@ Configuration::add(
return *this;
}
-
void
Configuration::print_usage(const std::string& program, std::ostream& os)
{
@@ -71,7 +69,6 @@ Configuration::print_usage(const std::string& program, std::ostream& os)
}
}
-
int
Configuration::set_value_from_string(Configuration::Option& option, const std::string& value)
throw (Configuration::CommandLineError)
@@ -97,7 +94,6 @@ Configuration::set_value_from_string(Configuration::Option& option, const std::s
return EXIT_SUCCESS;
}
-
/** Parse command line arguments. */
void
Configuration::parse(int argc, char** argv) throw (Configuration::CommandLineError)
@@ -144,7 +140,6 @@ Configuration::parse(int argc, char** argv) throw (Configuration::CommandLineErr
}
}
-
void
Configuration::print(std::ostream& os, const std::string mime_type) const
{
@@ -154,7 +149,6 @@ Configuration::print(std::ostream& os, const std::string mime_type) const
}
}
-
const Raul::Atom&
Configuration::option(const std::string& long_name)
{
diff --git a/src/Maid.cpp b/src/Maid.cpp
index 7403dbd..8bab395 100644
--- a/src/Maid.cpp
+++ b/src/Maid.cpp
@@ -21,13 +21,11 @@
namespace Raul {
-
Maid::Maid(size_t size)
: _objects(size)
{
}
-
Maid::~Maid()
{
cleanup();
@@ -44,7 +42,6 @@ Maid::manage(SharedPtr<Raul::Deletable> ptr)
_managed.push_back(new Raul::List<SharedPtr<Raul::Deletable> >::Node(ptr));
}
-
/** Free all the objects in the queue (passed by push()).
*/
void
@@ -70,5 +67,4 @@ Maid::cleanup()
}
-
} // namespace Raul
diff --git a/src/Path.cpp b/src/Path.cpp
index 4fbaa58..fff4fbd 100644
--- a/src/Path.cpp
+++ b/src/Path.cpp
@@ -36,7 +36,6 @@ Path::is_path(const Raul::URI& uri)
&& Path::is_valid(uri.str());
}
-
Path::Path(const std::basic_string<char>& path)
: URI(path[0] == '/' ? root_uri.str() + path.substr(1) : path)
{
@@ -44,7 +43,6 @@ Path::Path(const std::basic_string<char>& path)
throw BadPath(str());
}
-
Path::Path(const char* cpath)
: URI(cpath[0] == '/' ? root_uri.str() + (cpath + 1) : cpath)
{
@@ -52,7 +50,6 @@ Path::Path(const char* cpath)
throw BadPath(str());
}
-
bool
Path::is_valid(const std::basic_string<char>& path_str)
{
@@ -99,7 +96,6 @@ Path::is_valid(const std::basic_string<char>& path_str)
return true;
}
-
/** Convert a string to a valid full path.
*
* The returned string is a valid relative path without the root prefix,
@@ -134,7 +130,6 @@ Path::pathify(const std::basic_string<char>& str)
return path;
}
-
/** Convert a string to a valid name (or "method" - tokens between slashes)
*
* This will strip all slashes, etc, and always return a valid name/method.
@@ -154,7 +149,6 @@ Path::nameify(const std::basic_string<char>& str)
return name;
}
-
/** Replace any invalid characters in @a str with a suitable replacement.
*/
void
@@ -203,7 +197,6 @@ Path::replace_invalid_chars(std::string& str, size_t start, bool replace_slash)
str = prefix + str;
}
-
bool
Path::is_child_of(const Path& parent) const
{
@@ -211,13 +204,11 @@ Path::is_child_of(const Path& parent) const
return (substr(0, parent_base.length()) == parent_base);
}
-
bool
Path::is_parent_of(const Path& child) const
{
return child.is_child_of(*this);
}
-
} // namespace Raul
diff --git a/src/SMFReader.cpp b/src/SMFReader.cpp
index 1a75074..468738b 100644
--- a/src/SMFReader.cpp
+++ b/src/SMFReader.cpp
@@ -30,7 +30,6 @@ using std::endl;
namespace Raul {
-
/** Return the size of the given event NOT including the status byte,
* or -1 if unknown (eg sysex)
*/
@@ -73,7 +72,6 @@ midi_event_size(unsigned char status)
return -1;
}
-
SMFReader::SMFReader(const std::string filename)
: _fd(NULL)
, _ppqn(0)
@@ -84,14 +82,12 @@ SMFReader::SMFReader(const std::string filename)
open(filename);
}
-
SMFReader::~SMFReader()
{
if (_fd)
close();
}
-
bool
SMFReader::open(const std::string& filename) throw (std::logic_error, UnsupportedTime)
{
@@ -143,7 +139,6 @@ SMFReader::open(const std::string& filename) throw (std::logic_error, Unsupporte
}
}
-
/** Seek to the start of a given track, starting from 1.
* Returns true if specified track was found.
*/
@@ -191,7 +186,6 @@ SMFReader::seek_to_track(unsigned track) throw (std::logic_error)
}
}
-
/** Read an event from the current position in file.
*
* File position MUST be at the beginning of a delta time, or this will die very messily.
@@ -284,7 +278,6 @@ SMFReader::read_event(size_t buf_len,
}
}
-
void
SMFReader::close()
{
@@ -294,7 +287,6 @@ SMFReader::close()
_fd = NULL;
}
-
uint32_t
SMFReader::read_var_len(FILE* fd) throw (PrematureEOF)
{
@@ -316,6 +308,5 @@ SMFReader::read_var_len(FILE* fd) throw (PrematureEOF)
return value;
}
-
} // namespace Raul
diff --git a/src/SMFWriter.cpp b/src/SMFWriter.cpp
index 221c976..518658d 100644
--- a/src/SMFWriter.cpp
+++ b/src/SMFWriter.cpp
@@ -32,7 +32,6 @@ using std::endl;
namespace Raul {
-
/** Create a new SMF writer.
*
* @a unit must match the time stamp of ALL events passed to write, or
@@ -52,14 +51,12 @@ SMFWriter::SMFWriter(TimeUnit unit)
assert(unit.ppt() < std::numeric_limits<uint16_t>::max());
}
-
SMFWriter::~SMFWriter()
{
if (_fd)
finish();
}
-
/** Start a write to an SMF file.
*
* @a filename Filename to write to.
@@ -89,7 +86,6 @@ SMFWriter::start(const std::string& filename,
return (_fd == 0) ? -1 : 0;
}
-
/** Write an event at the end of the file.
*
* @a time is the absolute time of the event, relative to the start of the file
@@ -136,7 +132,6 @@ SMFWriter::write_event(Raul::TimeStamp time,
_track_size += stamp_size + ev_size;
}
-
void
SMFWriter::flush()
{
@@ -144,7 +139,6 @@ SMFWriter::flush()
fflush(_fd);
}
-
void
SMFWriter::finish() throw (std::logic_error)
{
@@ -156,7 +150,6 @@ SMFWriter::finish() throw (std::logic_error)
_fd = NULL;
}
-
void
SMFWriter::write_header()
{
@@ -182,7 +175,6 @@ SMFWriter::write_header()
write_chunk_header("MTrk", _track_size);
}
-
void
SMFWriter::write_footer()
{
@@ -194,7 +186,6 @@ SMFWriter::write_footer()
fwrite(eot, 1, 4, _fd);
}
-
void
SMFWriter::write_chunk_header(const char id[4], uint32_t length)
{
@@ -204,7 +195,6 @@ SMFWriter::write_chunk_header(const char id[4], uint32_t length)
fwrite(&length_be, 4, 1, _fd);
}
-
void
SMFWriter::write_chunk(const char id[4], uint32_t length, void* data)
{
@@ -213,7 +203,6 @@ SMFWriter::write_chunk(const char id[4], uint32_t length, void* data)
fwrite(data, 1, length, _fd);
}
-
/** Write an SMF variable length value.
*
* @return size (in bytes) of the value written.
@@ -243,6 +232,5 @@ SMFWriter::write_var_len(uint32_t value)
return ret;
}
-
} // namespace Raul
diff --git a/src/Symbol.cpp b/src/Symbol.cpp
index f16fef1..53060c6 100644
--- a/src/Symbol.cpp
+++ b/src/Symbol.cpp
@@ -24,7 +24,6 @@ using std::string;
namespace Raul {
-
bool
Symbol::is_valid(const std::basic_string<char>& symbol)
{
@@ -50,7 +49,6 @@ Symbol::is_valid(const std::basic_string<char>& symbol)
return true;
}
-
/** Convert a string to a valid symbol.
*
* This will make a best effort at turning @a str into a complete, valid
@@ -71,6 +69,5 @@ Symbol::symbolify(const std::basic_string<char>& str)
return symbol;
}
-
} // namespace Raul
diff --git a/src/Thread.cpp b/src/Thread.cpp
index 8c89707..78edacc 100644
--- a/src/Thread.cpp
+++ b/src/Thread.cpp
@@ -31,7 +31,6 @@ namespace Raul {
pthread_once_t Thread::_thread_key_once = PTHREAD_ONCE_INIT;
pthread_key_t Thread::_thread_key;
-
Thread::Thread(const std::string& name)
: _exit_flag(false)
, _name(name)
@@ -42,7 +41,6 @@ Thread::Thread(const std::string& name)
pthread_setspecific(_thread_key, this);
}
-
/** Must be called from thread */
Thread::Thread(pthread_t thread, const std::string& name)
: _exit_flag(false)
@@ -55,7 +53,6 @@ Thread::Thread(pthread_t thread, const std::string& name)
pthread_setspecific(_thread_key, this);
}
-
/** Return the calling thread.
* The return value of this should NOT be cached unless the thread is
* explicitly user created with create().
@@ -70,7 +67,6 @@ Thread::get()
return *this_thread;
}
-
void*
Thread::_static_run(void* thread)
{
@@ -81,7 +77,6 @@ Thread::_static_run(void* thread)
return NULL;
}
-
/** Launch and start the thread. */
void
Thread::start()
@@ -140,6 +135,5 @@ Thread::set_scheduling(int policy, unsigned int priority)
}
}
-
} // namespace Raul
diff --git a/src/log.cpp b/src/log.cpp
index 5a1ea8a..12f6139 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -51,7 +51,6 @@ std::ostream warn(&warn_buffer);
std::ostream error(&error_buffer);
std::ostream debug(&debug_buffer);
-
std::string
Raul::LogBuffer::colour(Colour c)
{
@@ -60,14 +59,12 @@ Raul::LogBuffer::colour(Colour c)
return ss.str();
}
-
std::string
Raul::LogBuffer::plain()
{
return "\033[0m";
}
-
void
Raul::LogBuffer::emit()
{
@@ -83,5 +80,4 @@ Raul::LogBuffer::emit()
_line.clear();
}
-
} // namespace Raul