From b7e443cb84ae1e0c92e64fff19a16792e506b336 Mon Sep 17 00:00:00 2001
From: Leif Johnson <leif@ambient.2y.net>
Date: Thu, 9 Oct 2003 22:02:37 +0000
Subject: changing 'channel' to 'track' to avoid naming overlap

Original commit message from CVS:
changing 'channel' to 'track' to avoid naming overlap
---
 sys/oss/gstossmixer.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'sys/oss/gstossmixer.h')

diff --git a/sys/oss/gstossmixer.h b/sys/oss/gstossmixer.h
index fb662f68..4866a197 100644
--- a/sys/oss/gstossmixer.h
+++ b/sys/oss/gstossmixer.h
@@ -28,11 +28,11 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GstOssMixerChannel {
-  GstMixerChannel parent;
-  gint            lvol, rvol;
-  gint            channel_num;
-} GstOssMixerChannel;
+typedef struct _GstOssMixerTrack {
+  GstMixerTrack parent;
+  gint          lvol, rvol;
+  gint          track_num;
+} GstOssMixerTrack;
 
 void		gst_ossmixer_interface_init	(GstMixerClass *klass);
 void		gst_oss_interface_init		(GstInterfaceClass *klass);
-- 
cgit