Whitespace and member ordering adjustments

diff --git a/source/sound.cpp b/source/sound.cpp
index c4a00efdedec278fa91c931b08e4054b12a487fe..fe2de5eb5c4b85faa6c05c25e64a0d30d44f775d 100644 (file)
--- a/source/sound.cpp
+++ b/source/sound.cpp
@@ -103,6 +103,21 @@ void Sound::open_memory(const void *d, unsigned len)
        open_common();
 }
 
+void Sound::open_common()
+{
+       delete data;
+       data = 0;
+
+       vorbis_info *info = ov_info(&ovfile, -1);
+       freq = info->rate;
+       switch(info->channels)
+       {
+       case 1: format = MONO16; break;
+       case 2: format = STEREO16; break;
+       default: throw runtime_error("Unsupported number of channels");
+       }
+}
+
 void Sound::load_data()
 {
        if(data)
@@ -176,20 +191,5 @@ const char *Sound::get_data() const
        return data;
 }
 
-void Sound::open_common()
-{
-       delete data;
-       data = 0;
-
-       vorbis_info *info = ov_info(&ovfile, -1);
-       freq = info->rate;
-       switch(info->channels)
-       {
-       case 1: format = MONO16; break;
-       case 2: format = STEREO16; break;
-       default: throw runtime_error("Unsupported number of channels");
-       }
-}
-
 } // namespace AL
 } // namespace Msp

diff --git a/source/sound.h b/source/sound.h
index bbc64e2d3978685dbc3720b947abf808ec9c2cc4..60bdf456319d4cf3298d74176c879aa62adb13fe 100644 (file)
--- a/source/sound.h
+++ b/source/sound.h
@@ -29,6 +29,9 @@ public:
 
        void open_file(const std::string &);
        void open_memory(const void *, unsigned);
+private:
+       void open_common();
+public:
        void load_data();
        void load_file(const std::string &);
        void load_memory(const void *, unsigned);
@@ -41,8 +44,6 @@ public:
        unsigned get_frequency() const { return freq; }
        unsigned get_size() const { return size; }
        const char *get_data() const;
-private:
-       void open_common();
 };
 
 } // namespace AL

diff --git a/source/source.h b/source/source.h
index 8e1e947350ff7d4625f5daeb29b7a4689c78e9f9..761e79175b8afaa6f3573a5e31e909b900c165b7 100644 (file)
--- a/source/source.h
+++ b/source/source.h
@@ -34,8 +34,8 @@ public:
        void set_position(float, float, float);
        void set_velocity(float, float, float);
        void set_gain(float);
-
        void set_rolloff_factor(float);
+
        void set_buffer(const Buffer &);
        void queue_buffers(const std::vector<const Buffer *> &);
        void queue_buffer(const Buffer &);

diff --git a/source/streamer.h b/source/streamer.h
index ff15bc4a30c5ff286b606aeedbdcaf1d39f80849..7843e9e8a0497e265bda373c55a557e99fa2f4a0 100644 (file)
--- a/source/streamer.h
+++ b/source/streamer.h
@@ -19,7 +19,7 @@ class Streamer
 {
 private:
        Source &src;
-       Sound  *snd;
+       Sound *snd;
        std::list<Buffer *> buffers;
 
 public: