Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gst-plugins-good-08-sunaudiomixer.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 18242 54c28d319822
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
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) {
upstream/oracle/spec-files