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 rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 18153 2f222bb8f8c5
child 18242 54c28d319822
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
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
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     4
 
@@ -79,6 +79,13 @@
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;
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     8
 
+	const char *utaudiodev;
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     9
 
+
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    10
 
+	utaudiodev = g_getenv ("UTAUDIODEV");
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    11
 
+	if (utaudiodev == NULL) {
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    12
 
+		//We are not on a Sun Ray, use OSS v4
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    13
 
+		return GST_STATE_CHANGE_FAILURE;
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    14
 
+	}
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