]> git.tdb.fi Git - xinema.git/blobdiff - source/xinestream.h
Reorder some members
[xinema.git] / source / xinestream.h
index c4df85ded5383b1dd6af54f7b7116a6adf9a92b3..254b84d66ec5030d922a975f1cdbd186c11a5623 100644 (file)
@@ -58,12 +58,6 @@ public:
        const Msp::Time::TimeDelta &get_duration() const { return duration; }
        const Msp::Time::TimeDelta &get_position() const { return position; }
        const std::string &get_title() const { return title; }
-       const std::vector<std::string> &get_audio_channels() const { return audio_channels; }
-       const std::vector<std::string> &get_spu_channels() const { return spu_channels; }
-       void select_audio_channel(int);
-       void select_spu_channel(int);
-       int get_current_audio_channel() const { return current_audio; }
-       int get_current_spu_channel() const { return current_spu; }
 
        void play();
        void seek(const Msp::Time::TimeDelta &);
@@ -73,6 +67,13 @@ private:
        void set_state(State);
 
 public:
+       const std::vector<std::string> &get_audio_channels() const { return audio_channels; }
+       const std::vector<std::string> &get_spu_channels() const { return spu_channels; }
+       void select_audio_channel(int);
+       void select_spu_channel(int);
+       int get_current_audio_channel() const { return current_audio; }
+       int get_current_spu_channel() const { return current_spu; }
+
        void tick();
 private:
        void update_info();