summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2006-02-05 16:41:16 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2006-02-05 16:41:16 +0000
commite1852928f0990e70e6532883ff7ccfd9cc3e9195 (patch)
treefc553634f4049b78e88d6a05274cbdf75268143d /src
parent9b3d8c574edf021f4f5af3dbb651d880badd92d4 (diff)
downloadxine-lib-e1852928f0990e70e6532883ff7ccfd9cc3e9195.tar.gz
xine-lib-e1852928f0990e70e6532883ff7ccfd9cc3e9195.tar.bz2
[xine-devel] PATCH: add control buffer for resetting audio decoder's track map
CVS patchset: 7875 CVS date: 2006/02/05 16:41:16
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/audio_decoder.c15
-rw-r--r--src/xine-engine/buffer.h27
2 files changed, 28 insertions, 14 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index a380d7af3..b6d674370 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_decoder.c,v 1.136 2005/10/30 02:18:35 miguelfreitas Exp $
+ * $Id: audio_decoder.c,v 1.137 2006/02/05 16:41:16 miguelfreitas Exp $
*
*
* functions that implement audio decoding
@@ -226,6 +226,19 @@ static void *audio_decoder_loop (void *stream_gen) {
}
break;
+ case BUF_CONTROL_RESET_TRACK_MAP:
+ if (stream->audio_track_map_entries)
+ {
+ xine_event_t ui_event;
+
+ stream->audio_track_map_entries = 0;
+
+ ui_event.type = XINE_EVENT_UI_CHANNELS_CHANGED;
+ ui_event.data_length = 0;
+ xine_event_send(stream, &ui_event);
+ }
+ break;
+
default:
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index ee97d981d..558539765 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer.h,v 1.153 2005/10/29 19:52:35 tmmm Exp $
+ * $Id: buffer.h,v 1.154 2006/02/05 16:41:16 miguelfreitas Exp $
*
*
* contents:
@@ -74,18 +74,19 @@ extern "C" {
/* control buffer types */
-#define BUF_CONTROL_BASE 0x01000000
-#define BUF_CONTROL_START 0x01000000
-#define BUF_CONTROL_END 0x01010000
-#define BUF_CONTROL_QUIT 0x01020000
-#define BUF_CONTROL_DISCONTINUITY 0x01030000 /* former AVSYNC_RESET */
-#define BUF_CONTROL_NOP 0x01040000
-#define BUF_CONTROL_AUDIO_CHANNEL 0x01050000
-#define BUF_CONTROL_SPU_CHANNEL 0x01060000
-#define BUF_CONTROL_NEWPTS 0x01070000
-#define BUF_CONTROL_RESET_DECODER 0x01080000
-#define BUF_CONTROL_HEADERS_DONE 0x01090000
-#define BUF_CONTROL_FLUSH_DECODER 0x010a0000
+#define BUF_CONTROL_BASE 0x01000000
+#define BUF_CONTROL_START 0x01000000
+#define BUF_CONTROL_END 0x01010000
+#define BUF_CONTROL_QUIT 0x01020000
+#define BUF_CONTROL_DISCONTINUITY 0x01030000 /* former AVSYNC_RESET */
+#define BUF_CONTROL_NOP 0x01040000
+#define BUF_CONTROL_AUDIO_CHANNEL 0x01050000
+#define BUF_CONTROL_SPU_CHANNEL 0x01060000
+#define BUF_CONTROL_NEWPTS 0x01070000
+#define BUF_CONTROL_RESET_DECODER 0x01080000
+#define BUF_CONTROL_HEADERS_DONE 0x01090000
+#define BUF_CONTROL_FLUSH_DECODER 0x010a0000
+#define BUF_CONTROL_RESET_TRACK_MAP 0x010b0000
/* video buffer types: (please keep in sync with buffer_types.c) */