Minor refactoring

Author: chrisn

README.md

@@ -439,7 +439,8 @@ either -1 (default compression) or between 0 (fastest) and 9 (best compression).
 
 #### `--raw-samplerate`
 
-When using raw input audio format, this must be set to the appropriate samplerate.
+When using raw input audio format, this must be set to the appropriate sample
+rate, in Hz.
 
 #### `--raw-channels`
 

doc/audiowaveform.1

@@ -206,7 +206,7 @@ either -1 (default compression) or between 0 (fastest) and 9 (best compression).
 .TP
 .B --raw-samplerate\fR <rate>
 When using raw input audio format, this must be set to the appropriate
-samplerate.
+sample rate, in Hz.
 
 .TP
 .B --raw-channels\fR <n>

src/Options.cpp

@@ -254,7 +254,7 @@ bool Options::parseCommandLine(int argc, const char* const* argv)
     )(
         "raw-samplerate",
         po::value<int>(&raw_samplerate_),
-        "samplerate for raw audio input"
+        "sample rate for raw audio input (Hz)"
     )(
         "raw-channels",
         po::value<int>(&raw_channels_),
@@ -340,7 +340,8 @@ bool Options::parseCommandLine(int argc, const char* const* argv)
             reportError("Invalid bits: must be either 8 or 16");
             return false;
         }
-        else if (png_compression_level_ < -1 || png_compression_level_ > 9) {
+
+        if (png_compression_level_ < -1 || png_compression_level_ > 9) {
             reportError("Invalid compression level: must be from 0 (none) to 9 (best), or -1 (default)");
             return false;
         }

src/Options.h

@@ -26,16 +26,15 @@
 
 //------------------------------------------------------------------------------
 
-#include "Rgba.h"
-#include "AudioFileReader.h"
 #include "FileFormat.h"
+#include "Rgba.h"
 
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 
 #include <iosfwd>
-#include <string>
 #include <stdexcept>
+#include <string>
 
 //------------------------------------------------------------------------------