changeset in /hg/pulseaudio: 2008-08-11 Omair Majid <omajid at redh...

[Omair Majid]

changeset 3a4ea335aefc in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=3a4ea335aefc
description:
	2008-08-11 Omair Majid <omajid at redhat.com>

	    * .classpath: fixed eclipse project settings to use src/java as the source directory
	    * src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java: fixed to point to the generated .so file
	    * src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java: same
	    * src/native/Makefile.am: added org_classpath_icedtea_pulseaudio_Operation.{c,h} as files to be compiled
	    * build.xml: added Operation as a class to generate header files for

diffstat:

5 files changed, 5 insertions(+), 4 deletions(-)
.classpath                                                                   |    2 +-
build.xml                                                                    |    1 +
src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java      |    1 -
src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java |    1 -
src/native/Makefile.am                                                       |    4 +++-

diffs (60 lines):

diff -r a1efb395982d -r 3a4ea335aefc .classpath
--- a/.classpath	Mon Aug 11 13:39:44 2008 -0400
+++ b/.classpath	Mon Aug 11 14:34:54 2008 -0400
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="unittests"/>
+	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r a1efb395982d -r 3a4ea335aefc build.xml
--- a/build.xml	Mon Aug 11 13:39:44 2008 -0400
+++ b/build.xml	Mon Aug 11 14:34:54 2008 -0400
@@ -36,6 +36,7 @@
 	<target name="headers" depends="compile">
 		<javah classpath="${classdir}" destdir="${headerdir}" verbose="no" force="yes">
 			<class name="org.classpath.icedtea.pulseaudio.EventLoop"/>
+			<class name="org.classpath.icedtea.pulseaudio.Operation"/>
 			<class name="org.classpath.icedtea.pulseaudio.PulseAudioSourceDataLine"/>
 			<class name="org.classpath.icedtea.pulseaudio.PulseAudioStreamVolumeControl"/>
 		</javah>
diff -r a1efb395982d -r 3a4ea335aefc src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Mon Aug 11 13:39:44 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Mon Aug 11 14:34:54 2008 -0400
@@ -111,7 +111,6 @@ public class PulseAudioSourceDataLine im
 	static {
 		try {
 			String library = new java.io.File(".").getCanonicalPath()
-					+ java.io.File.separatorChar + "lib"
 					+ java.io.File.separatorChar
 					+ System.mapLibraryName("pulse-java");
 			System.out.println(library);
diff -r a1efb395982d -r 3a4ea335aefc src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java	Mon Aug 11 13:39:44 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java	Mon Aug 11 14:34:54 2008 -0400
@@ -14,7 +14,6 @@ public class PulseAudioStreamVolumeContr
 	static {
 		try {
 			String library = new java.io.File(".").getCanonicalPath()
-					+ java.io.File.separatorChar + "lib"
 					+ java.io.File.separatorChar
 					+ System.mapLibraryName("pulse-java");
 			System.out.println(library);
diff -r a1efb395982d -r 3a4ea335aefc src/native/Makefile.am
--- a/src/native/Makefile.am	Mon Aug 11 13:39:44 2008 -0400
+++ b/src/native/Makefile.am	Mon Aug 11 14:34:54 2008 -0400
@@ -8,7 +8,9 @@ libpulse_java_la_SOURCES = \
 	org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.c \
 	org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.h \
 	org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.c \
-	org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.h
+	org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.h \
+	org_classpath_icedtea_pulseaudio_Operation.h \
+	org_classpath_icedtea_pulseaudio_Operation.c
 
 AM_CFLAGS = -g -Wall -Werror $(PLATFORM_FLAGS) -D_REENTRANT 
 AM_LDFLAGS = -g -Wall -Werror -lpulse