patches/gst-plugins-good-08-sunaudiomixer.diff
author yippi
Fri, 16 Jul 2010 04:36:23 +0000
changeset 18242 54c28d319822
parent 18153 2f222bb8f8c5
permissions -rw-r--r--
2010-07-15 Brian Cameron <[email protected]> * base-specs/poppler.spec, patches/poppler-05-compile.diff: Bump to 0.14.1. Remove upstream patch. * base-specs/poppler-data.spec: Bump to 0.4.3. * base-specs/python-twisted.spec: Bump to 10.1.0. * base-specs/gst.spec: Bump to 0.10.30. * base-specs/gst-plugins-base.spec: Bump to 0.10.30. * base-specs/gst-plugins-good.spec: Bump to 0.10.24. * patches/gst-plugins-good-06-tvtime.diff, patches/gst-plugins-good-08-sunaudiomixer.diff, patches/gst-plugins-good-09-videomixer.diff: Rework. * base-specs/gst-python.spec: Bump to 0.10.19. * base-specs/xchat.spec: Bump to 2.8.8. * patches/xchat-02-new-gtk-GtkType.diff, patches/xchat-03-xc286-smallfixes.diff, patches-xchat-05-button-underline.diff, patches/xchat-06-gtk2.20.diff: Remove upstream patches. * patches/xchat-02-ctcp-version.diff: Renumber from 04. * base-specs/iso-codes.spec: Bump to 3.18.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18153
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     1
diff -ur gst-plugins-good-0.10.16-old/sys/sunaudio/gstsunaudiomixer.c gst-plugins-good-0.10.16/sys/sunaudio/gstsunaudiomixer.c
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     2
--- gst-plugins-good-0.10.16-old/sys/sunaudio/gstsunaudiomixer.c	2009-08-11 06:15:55.000000000 +0800
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     3
+++ gst-plugins-good-0.10.16/sys/sunaudio/gstsunaudiomixer.c	2009-09-03 15:17:21.106331729 +0800
18242
54c28d319822 2010-07-15 Brian Cameron <[email protected]>
yippi
parents: 18153
diff changeset
     4
@@ -75,6 +75,13 @@ gst_sunaudiomixer_change_state (GstEleme
18153
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     5
     case GST_STATE_CHANGE_NULL_TO_READY:
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     6
       if (!this->mixer) {
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     7
         const char *audiodev;
18242
54c28d319822 2010-07-15 Brian Cameron <[email protected]>
yippi
parents: 18153
diff changeset
     8
+        const char *utaudiodev;
18153
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     9
+
18242
54c28d319822 2010-07-15 Brian Cameron <[email protected]>
yippi
parents: 18153
diff changeset
    10
+        utaudiodev = g_getenv ("UTAUDIODEV");
54c28d319822 2010-07-15 Brian Cameron <[email protected]>
yippi
parents: 18153
diff changeset
    11
+        if (utaudiodev == NULL) {
54c28d319822 2010-07-15 Brian Cameron <[email protected]>
yippi
parents: 18153
diff changeset
    12
+                //We are not on a Sun Ray, use OSS v4
54c28d319822 2010-07-15 Brian Cameron <[email protected]>
yippi
parents: 18153
diff changeset
    13
+                return GST_STATE_CHANGE_FAILURE;
54c28d319822 2010-07-15 Brian Cameron <[email protected]>
yippi
parents: 18153
diff changeset
    14
+        }
18153
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    15
 
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    16
         audiodev = g_getenv ("AUDIODEV");
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    17
         if (audiodev == NULL) {