X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fxinestream.h;h=554b448aac489ff7ab5b899b7cec8181ac63249a;hb=19f69a037e98b6b510fca0f270a5a0cf05de522d;hp=def7f01a5f9d2dbd6a5e0ee694670c8c597e0bf6;hpb=e9e15ac445100aee25fb3314a3ad89e7142c33fb;p=xinema.git

diff --git a/source/xinestream.h b/source/xinestream.h
index def7f01..554b448 100644
--- a/source/xinestream.h
+++ b/source/xinestream.h
@@ -2,7 +2,9 @@
 #define XINESTREAM_H_
 
 #include <string>
+#include <vector>
 #include <xine.h>
+#include <msp/core/mutex.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/time/timedelta.h>
 
@@ -18,28 +20,45 @@ public:
 		PLAYING
 	};
 
+	enum
+	{
+		OFF = -1
+	};
+
 	sigc::signal<void, State> signal_state_changed;
 	sigc::signal<void, const std::string &> signal_title_changed;
 	sigc::signal<void, const Msp::Time::TimeDelta &> signal_duration_changed;
 	sigc::signal<void, const Msp::Time::TimeDelta &> signal_position_changed;
+	sigc::signal<void> signal_channels_changed;
+	sigc::signal<void, int> signal_current_audio_channel_changed;
+	sigc::signal<void, int> signal_current_spu_channel_changed;
+	sigc::signal<void> signal_finished;
 
 private:
 	XineEngine &engine;
+	std::string filename;
 	xine_stream_t *stream;
 	xine_event_queue_t *queue;
+	Msp::Mutex mutex;
 	State state;
 	std::string title;
 	Msp::Time::TimeDelta duration;
 	Msp::Time::TimeDelta position;
+	std::vector<std::string> audio_channels;
+	std::vector<std::string> spu_channels;
+	int current_audio;
+	int current_spu;
+	bool channels_changed;
 
 public:
 	XineStream(XineEngine &, const std::string &);
 	~XineStream();
 
+	Msp::Mutex &get_mutex() { return mutex; }
 	State get_state() const { return state; }
 	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::string &get_title() const;
 
 	void play();
 	void seek(const Msp::Time::TimeDelta &);
@@ -49,9 +68,17 @@ 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 check_info();
+	void update_info();
+	void update_channels();
 	void handle_event(const xine_event_t &);
 };