diff --git a/libgeneric-pc/audio.cpp b/libgeneric-pc/audio.cpp
index e9d3514..e0d98f9 100644
--- a/libgeneric-pc/audio.cpp
+++ b/libgeneric-pc/audio.cpp
@@ -132,9 +132,11 @@ void cAudio::SetSyncMode(AVSYNC_TYPE Mode)
 	hal_debug("%s %d\n", __func__, Mode);
 };
 
-void cAudio::SetStreamType(AUDIO_FORMAT type)
+void cAudio::SetStreamType(int bypass)
 {
-	hal_debug("%s %d\n", __func__, type);
+	StreamType = bypass;
+
+	hal_debug("%s %d (0x%x)\n", __FUNCTION__, bypass, bypass);
 };
 
 int cAudio::setChannel(int /*channel*/)
diff --git a/libgeneric-pc/audio_lib.h b/libgeneric-pc/audio_lib.h
index 8d4f45b..0d0a24e 100644
--- a/libgeneric-pc/audio_lib.h
+++ b/libgeneric-pc/audio_lib.h
@@ -49,7 +49,7 @@ class cAudio : public OpenThreads::Thread
 		int mixer_fd;  /* if we are using the OSS mixer */
 		int mixer_num; /* oss mixer to use, if any */
 
-		AUDIO_FORMAT	StreamType;
+		int	StreamType;
 		AUDIO_SYNC_MODE    SyncMode;
 		bool started;
 		bool thread_started;
@@ -84,7 +84,8 @@ class cAudio : public OpenThreads::Thread
 		int Start(void);
 		int Stop(void);
 		bool Pause(bool Pcm = true);
-		void SetStreamType(AUDIO_FORMAT type);
+		void SetStreamType(int bypass);
+		int GetStreamType(void) { return StreamType; }
 		void SetSyncMode(AVSYNC_TYPE Mode);
 
 		/* select channels */
diff --git a/libgeneric-pc/video_lib.h b/libgeneric-pc/video_lib.h
index 56e1c2a..c4b903b 100644
--- a/libgeneric-pc/video_lib.h
+++ b/libgeneric-pc/video_lib.h
@@ -200,7 +200,7 @@ class cVideo : public OpenThreads::Thread
 		void SetCECAutoView(bool) { return; };
 		void SetCECAutoStandby(bool) { return; };
 		int  GetAudioDestination() { return 0; };
-		void SetAudioDestination(int audio_dest) { };
+		void SetAudioDestination(int audio_dest) { return; };
 		void StopPicture();
 		void Standby(unsigned int bOn);
 		void Pig(int x, int y, int w, int h, int osd_w = 1064, int osd_h = 600, int startx = 0, int starty = 0, int endx = 1279, int endy = 719);