[pkg-java] r11735 - in trunk/libbasicplayer-java/debian: . patches source

[Ahmed El-Mahmoudy]

Author: aelmahmoudy-guest
Date: 2010-02-27 13:56:08 +0000 (Sat, 27 Feb 2010)
New Revision: 11735

Added:
   trunk/libbasicplayer-java/debian/patches/
   trunk/libbasicplayer-java/debian/patches/pulseaudio.diff
   trunk/libbasicplayer-java/debian/patches/series
   trunk/libbasicplayer-java/debian/source/
   trunk/libbasicplayer-java/debian/source/format
Modified:
   trunk/libbasicplayer-java/debian/changelog
   trunk/libbasicplayer-java/debian/control
Log:
* Add pulseaudio.diff patch to workaround OpenJDK's Pulse Audio
  implementation.
* debian/control:
  + Bump Standards-Version to 3.8.4
  + Changed section to java.


Modified: trunk/libbasicplayer-java/debian/changelog
===================================================================
--- trunk/libbasicplayer-java/debian/changelog	2010-02-27 13:31:29 UTC (rev 11734)
+++ trunk/libbasicplayer-java/debian/changelog	2010-02-27 13:56:08 UTC (rev 11735)
@@ -1,3 +1,13 @@
+libbasicplayer-java (3.0-4) UNRELEASED; urgency=low
+
+  * Add pulseaudio.diff patch to workaround OpenJDK's Pulse Audio
+    implementation (Closes: #567856).
+  * debian/control:
+    + Bump Standards-Version to 3.8.4
+    + Changed section to java.
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Sun, 31 Jan 2010 20:06:40 +0200
+
 libbasicplayer-java (3.0-3) unstable; urgency=low
 
   * Move the package to pkg-java svn.

Modified: trunk/libbasicplayer-java/debian/control
===================================================================
--- trunk/libbasicplayer-java/debian/control	2010-02-27 13:31:29 UTC (rev 11734)
+++ trunk/libbasicplayer-java/debian/control	2010-02-27 13:56:08 UTC (rev 11735)
@@ -1,11 +1,11 @@
 Source: libbasicplayer-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5)
 Build-Depends-Indep: ant, java-gcj-compat-dev,  libcommons-logging-java, libtritonus-java, libvorbisspi-java
-Standards-Version: 3.7.3
+Standards-Version: 3.8.4
 Homepage: http://www.javazoom.net/jlgui/api.html
 Vcs-Svn: https://bollin.googlecode.com/svn/libbasicplayer-java/trunk
 Vcs-Browser: http://bollin.googlecode.com/svn/libbasicplayer-java/trunk

Added: trunk/libbasicplayer-java/debian/patches/pulseaudio.diff
===================================================================
--- trunk/libbasicplayer-java/debian/patches/pulseaudio.diff	                        (rev 0)
+++ trunk/libbasicplayer-java/debian/patches/pulseaudio.diff	2010-02-27 13:56:08 UTC (rev 11735)
@@ -0,0 +1,63 @@
+Description: Workaround OpenJDK's Pulse Audio implementation
+ The pulse audio implementation in OpenJDK claims to support gain when you
+ call isControlSupported, but then throws an exception anyway. So put a try
+ catch around isControlSupported calls to avoid problems, please refer to:
+ http://stackoverflow.com/questions/1914216/master-gain-not-supported-in-openjdk
+--- a/src/javazoom/jlgui/basicplayer/BasicPlayer.java
++++ b/src/javazoom/jlgui/basicplayer/BasicPlayer.java
+@@ -454,17 +454,23 @@
+                 log.debug("Controls : " + c[p].toString());
+             }
+             /*-- Is Gain Control supported ? --*/
+-            if (m_line.isControlSupported(FloatControl.Type.MASTER_GAIN))
+-            {
+-                m_gainControl = (FloatControl) m_line.getControl(FloatControl.Type.MASTER_GAIN);
+-                log.info("Master Gain Control : [" + m_gainControl.getMinimum() + "," + m_gainControl.getMaximum() + "] " + m_gainControl.getPrecision());
++            try {
++              if (m_line.isControlSupported(FloatControl.Type.MASTER_GAIN))
++              {
++                  m_gainControl = (FloatControl) m_line.getControl(FloatControl.Type.MASTER_GAIN);
++                  log.info("Master Gain Control : [" + m_gainControl.getMinimum() + "," + m_gainControl.getMaximum() + "] " + m_gainControl.getPrecision());
++              }
+             }
++            catch (IllegalArgumentException e) { }
+             /*-- Is Pan control supported ? --*/
+-            if (m_line.isControlSupported(FloatControl.Type.PAN))
+-            {
+-                m_panControl = (FloatControl) m_line.getControl(FloatControl.Type.PAN);
+-                log.info("Pan Control : [" + m_panControl.getMinimum() + "," + m_panControl.getMaximum() + "] " + m_panControl.getPrecision());
++            try {
++              if (m_line.isControlSupported(FloatControl.Type.PAN))
++              {
++                  m_panControl = (FloatControl) m_line.getControl(FloatControl.Type.PAN);
++                  log.info("Pan Control : [" + m_panControl.getMinimum() + "," + m_panControl.getMaximum() + "] " + m_panControl.getPrecision());
++              }
+             }
++            catch (IllegalArgumentException e) { }
+         }
+     }
+ 
+@@ -795,7 +801,10 @@
+         if (m_gainControl == null)
+         {
+             // Try to get Gain control again (to support J2SE 1.5)
+-            if ( (m_line != null) && (m_line.isControlSupported(FloatControl.Type.MASTER_GAIN))) m_gainControl = (FloatControl) m_line.getControl(FloatControl.Type.MASTER_GAIN);
++            try {
++              if ( (m_line != null) && (m_line.isControlSupported(FloatControl.Type.MASTER_GAIN))) m_gainControl = (FloatControl) m_line.getControl(FloatControl.Type.MASTER_GAIN);
++            }
++            catch (IllegalArgumentException e) { }
+         }
+         return m_gainControl != null;
+     }
+@@ -853,7 +862,10 @@
+         if (m_panControl == null)
+         {
+             // Try to get Pan control again (to support J2SE 1.5)
+-            if ((m_line != null)&& (m_line.isControlSupported(FloatControl.Type.PAN))) m_panControl = (FloatControl) m_line.getControl(FloatControl.Type.PAN);
++            try {
++              if ((m_line != null)&& (m_line.isControlSupported(FloatControl.Type.PAN))) m_panControl = (FloatControl) m_line.getControl(FloatControl.Type.PAN);
++            }
++            catch (IllegalArgumentException e) { }
+         }
+         return m_panControl != null;
+     }

Added: trunk/libbasicplayer-java/debian/patches/series
===================================================================
--- trunk/libbasicplayer-java/debian/patches/series	                        (rev 0)
+++ trunk/libbasicplayer-java/debian/patches/series	2010-02-27 13:56:08 UTC (rev 11735)
@@ -0,0 +1 @@
+pulseaudio.diff

Added: trunk/libbasicplayer-java/debian/source/format
===================================================================
--- trunk/libbasicplayer-java/debian/source/format	                        (rev 0)
+++ trunk/libbasicplayer-java/debian/source/format	2010-02-27 13:56:08 UTC (rev 11735)
@@ -0,0 +1 @@
+3.0 (quilt)