/hg/icedtea6: Fix whitespace.
dlila at icedtea.classpath.org
dlila at icedtea.classpath.org
Fri Jun 10 14:42:01 PDT 2011
changeset 1bb1af172bea in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1bb1af172bea
author: Denis Lila <dlila at redhat.com>
date: Fri Jun 10 17:42:18 2011 -0400
Fix whitespace.
diffstat:
ChangeLog | 3 +
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java | 28 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java | 2 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java | 102 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java | 354 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java | 180 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 826 +++---
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 728 ++--
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 120 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java | 1148 ++++----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerInfo.java | 28 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java | 32 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java | 72 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java | 180 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 450 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java | 68 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 554 ++--
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java | 60 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java | 86 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java | 28 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 1218 +++++-----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamBufferAttributes.java | 66 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java | 44 +-
pulseaudio/src/native/jni-common.c | 232 +-
pulseaudio/src/native/jni-common.h | 8 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c | 298 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c | 20 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c | 136 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c | 140 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 1138 ++++----
30 files changed, 4176 insertions(+), 4173 deletions(-)
diffs (truncated from 10007 to 500 lines):
diff -r c86fdd28db8f -r 1bb1af172bea ChangeLog
--- a/ChangeLog Fri Jun 10 16:23:25 2011 -0400
+++ b/ChangeLog Fri Jun 10 17:42:18 2011 -0400
@@ -1,3 +1,6 @@
+2011-06-10 Denis Lila <dlila at redhat.com>
+ * pulseaudio/*: Fix whitespace.
+
2011-06-10 Denis Lila <dlila at redhat.com>
* Makefile.am
(stamps/pulse-java-headers.stamp): Prepend the java build directory
diff -r c86fdd28db8f -r 1bb1af172bea pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java Fri Jun 10 16:23:25 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java Fri Jun 10 17:42:18 2011 -0400
@@ -47,22 +47,22 @@
class ContextEvent {
- /**
- * Basically, what is the new state of the context
- *
- */
- public static enum Type {
- UNCONNECTED, CONNECTING, AUTHORIZING, SETTING_NAME, READY, FAILED, TERMINATED
- }
+ /**
+ * Basically, what is the new state of the context
+ *
+ */
+ public static enum Type {
+ UNCONNECTED, CONNECTING, AUTHORIZING, SETTING_NAME, READY, FAILED, TERMINATED
+ }
- private Type type;
+ private Type type;
- public ContextEvent(Type type) {
- this.type = type;
- }
+ public ContextEvent(Type type) {
+ this.type = type;
+ }
- public Type getType() {
- return type;
- }
+ public Type getType() {
+ return type;
+ }
}
diff -r c86fdd28db8f -r 1bb1af172bea pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java Fri Jun 10 16:23:25 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java Fri Jun 10 17:42:18 2011 -0400
@@ -45,6 +45,6 @@
interface ContextListener {
- void update(ContextEvent e);
+ void update(ContextEvent e);
}
diff -r c86fdd28db8f -r 1bb1af172bea pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java Fri Jun 10 16:23:25 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java Fri Jun 10 17:42:18 2011 -0400
@@ -49,66 +49,66 @@
class Debug {
- enum DebugLevel {
- Verbose, Debug, Info, Warning, Error, None
- }
+ enum DebugLevel {
+ Verbose, Debug, Info, Warning, Error, None
+ }
- private static DebugLevel currentDebugLevel = DebugLevel.None;
+ private static DebugLevel currentDebugLevel = DebugLevel.None;
- static {
- // System.out.println("PulseAudio: initializing Debug");
+ static {
+ // System.out.println("PulseAudio: initializing Debug");
- String systemSetting;
- try {
- systemSetting = System.getProperty("pulseaudio.debugLevel");
- } catch (SecurityException e) {
- // sigh, we cant read that property
- systemSetting = null;
- }
+ String systemSetting;
+ try {
+ systemSetting = System.getProperty("pulseaudio.debugLevel");
+ } catch (SecurityException e) {
+ // sigh, we cant read that property
+ systemSetting = null;
+ }
- DebugLevel wantedLevel;
- try {
- wantedLevel = DebugLevel.valueOf(systemSetting);
+ DebugLevel wantedLevel;
+ try {
+ wantedLevel = DebugLevel.valueOf(systemSetting);
- } catch (IllegalArgumentException e) {
- wantedLevel = DebugLevel.Info;
- } catch (NullPointerException e) {
- wantedLevel = DebugLevel.None;
- }
+ } catch (IllegalArgumentException e) {
+ wantedLevel = DebugLevel.Info;
+ } catch (NullPointerException e) {
+ wantedLevel = DebugLevel.None;
+ }
- currentDebugLevel = wantedLevel;
- println(DebugLevel.Info, "Using debug level: " + currentDebugLevel);
- }
+ currentDebugLevel = wantedLevel;
+ println(DebugLevel.Info, "Using debug level: " + currentDebugLevel);
+ }
- static void println(String string) {
- println(DebugLevel.Info, string);
- }
+ static void println(String string) {
+ println(DebugLevel.Info, string);
+ }
- static void print(DebugLevel level, String string) {
- int result = level.compareTo(currentDebugLevel);
- if (result >= 0) {
- if (level.compareTo(DebugLevel.Error) >= 0) {
- System.err.print(string);
- } else {
- System.out.print(string);
- }
- } else {
- // do nothing
- }
- }
+ static void print(DebugLevel level, String string) {
+ int result = level.compareTo(currentDebugLevel);
+ if (result >= 0) {
+ if (level.compareTo(DebugLevel.Error) >= 0) {
+ System.err.print(string);
+ } else {
+ System.out.print(string);
+ }
+ } else {
+ // do nothing
+ }
+ }
- static void println(DebugLevel level, String string) {
+ static void println(DebugLevel level, String string) {
- int result = level.compareTo(currentDebugLevel);
- if (result >= 0) {
- if (level.compareTo(DebugLevel.Error) >= 0) {
- System.err.println("DEBUG: pulse-java: " + string);
- } else {
- System.out.println("DEBUG: pulse-java: " + string);
- }
- } else {
- // do nothing
- }
- }
+ int result = level.compareTo(currentDebugLevel);
+ if (result >= 0) {
+ if (level.compareTo(DebugLevel.Error) >= 0) {
+ System.err.println("DEBUG: pulse-java: " + string);
+ } else {
+ System.out.println("DEBUG: pulse-java: " + string);
+ }
+ } else {
+ // do nothing
+ }
+ }
}
diff -r c86fdd28db8f -r 1bb1af172bea pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java Fri Jun 10 16:23:25 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java Fri Jun 10 17:42:18 2011 -0400
@@ -52,231 +52,231 @@
final class EventLoop implements Runnable {
- /*
- * any methods that can obstruct the behaviour of pa_mainloop should run
- * synchronized
- */
+ /*
+ * any methods that can obstruct the behaviour of pa_mainloop should run
+ * synchronized
+ */
- /*
- * the threadLock object is the object used for synchronizing the
- * non-thread-safe operations of pulseaudio's c api
- */
- final Object threadLock = new Object();
+ /*
+ * the threadLock object is the object used for synchronizing the
+ * non-thread-safe operations of pulseaudio's c api
+ */
+ final Object threadLock = new Object();
- private static EventLoop instance = null;
+ private static EventLoop instance = null;
- private List<ContextListener> contextListeners;
- // private List<SourceDataLine> lines;
- private String appName;
- private String serverString;
+ private List<ContextListener> contextListeners;
+ // private List<SourceDataLine> lines;
+ private String appName;
+ private String serverString;
- private int status;
- // private boolean eventLoopIsRunning = false;
+ private int status;
+ // private boolean eventLoopIsRunning = false;
- private List<String> targetPortNameList = new ArrayList<String>();
- private List<String> sourcePortNameList = new ArrayList<String>();
+ private List<String> targetPortNameList = new ArrayList<String>();
+ private List<String> sourcePortNameList = new ArrayList<String>();
- /*
- * JNI stuff
- *
- * Do not synchronize the individual functions, synchronize
- * block/method/lines around the call
- */
+ /*
+ * JNI stuff
+ *
+ * Do not synchronize the individual functions, synchronize
+ * block/method/lines around the call
+ */
- private native void native_setup(String appName, String server);
+ private native void native_setup(String appName, String server);
- private native int native_iterate(int timeout);
+ private native int native_iterate(int timeout);
- private native void native_shutdown();
+ private native void native_shutdown();
- private native void native_set_sink_volume(byte[] streamPointer, int volume);
+ private native void native_set_sink_volume(byte[] streamPointer, int volume);
- /*
- * These fields hold pointers
- */
- private byte[] contextPointer;
- private byte[] mainloopPointer;
+ /*
+ * These fields hold pointers
+ */
+ private byte[] contextPointer;
+ private byte[] mainloopPointer;
- /*
- *
- */
+ /*
+ *
+ */
- static {
- SecurityWrapper.loadNativeLibrary();
- }
+ static {
+ SecurityWrapper.loadNativeLibrary();
+ }
- private EventLoop() {
- contextListeners = new ArrayList<ContextListener>();
- }
+ private EventLoop() {
+ contextListeners = new ArrayList<ContextListener>();
+ }
- synchronized static EventLoop getEventLoop() {
- if (instance == null) {
- instance = new EventLoop();
- }
- return instance;
- }
+ synchronized static EventLoop getEventLoop() {
+ if (instance == null) {
+ instance = new EventLoop();
+ }
+ return instance;
+ }
- void setAppName(String appName) {
- this.appName = appName;
- }
+ void setAppName(String appName) {
+ this.appName = appName;
+ }
- void setServer(String serverString) {
- this.serverString = serverString;
- }
+ void setServer(String serverString) {
+ this.serverString = serverString;
+ }
- @Override
- public void run() {
- native_setup(this.appName, this.serverString);
+ @Override
+ public void run() {
+ native_setup(this.appName, this.serverString);
- Debug.println(DebugLevel.Info, "Eventloop.run(): eventloop starting");
+ Debug.println(DebugLevel.Info, "Eventloop.run(): eventloop starting");
- /*
- * Perhaps this loop should be written in C doing a Java to C call on
- * every iteration of the loop might be slow
- */
- while (true) {
- synchronized (threadLock) {
- // timeout is in milliseconds
- // timout = 0 means dont block
- native_iterate(100);
+ /*
+ * Perhaps this loop should be written in C doing a Java to C call on
+ * every iteration of the loop might be slow
+ */
+ while (true) {
+ synchronized (threadLock) {
+ // timeout is in milliseconds
+ // timout = 0 means dont block
+ native_iterate(100);
- if (Thread.interrupted()) {
- native_shutdown();
+ if (Thread.interrupted()) {
+ native_shutdown();
- // clean up the listeners
- synchronized (contextListeners) {
- contextListeners.clear();
- }
+ // clean up the listeners
+ synchronized (contextListeners) {
+ contextListeners.clear();
+ }
- Debug.println(DebugLevel.Info,
- "EventLoop.run(): event loop terminated");
+ Debug.println(DebugLevel.Info,
+ "EventLoop.run(): event loop terminated");
- return;
+ return;
- }
- }
- }
+ }
+ }
+ }
- }
+ }
- void addContextListener(ContextListener contextListener) {
- synchronized (contextListeners) {
- contextListeners.add(contextListener);
- }
- }
+ void addContextListener(ContextListener contextListener) {
+ synchronized (contextListeners) {
+ contextListeners.add(contextListener);
+ }
+ }
- void removeContextListener(ContextListener contextListener) {
- synchronized (contextListeners) {
- contextListeners.remove(contextListener);
- }
- }
+ void removeContextListener(ContextListener contextListener) {
+ synchronized (contextListeners) {
+ contextListeners.remove(contextListener);
+ }
+ }
- int getStatus() {
- return this.status;
- }
+ int getStatus() {
+ return this.status;
+ }
- void update(int status) {
- synchronized (threadLock) {
- // System.out.println(this.getClass().getName()
- // + ".update() called! status = " + status);
- this.status = status;
- switch (status) {
- case 0:
- fireEvent(new ContextEvent(Type.UNCONNECTED));
- break;
- case 1:
- fireEvent(new ContextEvent(Type.CONNECTING));
- break;
- case 2:
- // no op
- break;
- case 3:
- // no op
- break;
- case 4:
- fireEvent(new ContextEvent(Type.READY));
- break;
- case 5:
- fireEvent(new ContextEvent(Type.FAILED));
- Debug.println(DebugLevel.Warning,
- "EventLoop.update(): Context failed");
- break;
- case 6:
- fireEvent(new ContextEvent(Type.TERMINATED));
- break;
- default:
+ void update(int status) {
+ synchronized (threadLock) {
+ // System.out.println(this.getClass().getName()
+ // + ".update() called! status = " + status);
+ this.status = status;
+ switch (status) {
+ case 0:
+ fireEvent(new ContextEvent(Type.UNCONNECTED));
+ break;
+ case 1:
+ fireEvent(new ContextEvent(Type.CONNECTING));
+ break;
+ case 2:
+ // no op
+ break;
+ case 3:
+ // no op
+ break;
+ case 4:
+ fireEvent(new ContextEvent(Type.READY));
+ break;
+ case 5:
+ fireEvent(new ContextEvent(Type.FAILED));
+ Debug.println(DebugLevel.Warning,
+ "EventLoop.update(): Context failed");
+ break;
+ case 6:
+ fireEvent(new ContextEvent(Type.TERMINATED));
+ break;
+ default:
- }
- }
- }
+ }
+ }
+ }
- private void fireEvent(final ContextEvent e) {
- // System.out.println(this.getClass().getName() + "firing event: "
- // + e.getType().toString());
+ private void fireEvent(final ContextEvent e) {
+ // System.out.println(this.getClass().getName() + "firing event: "
+ // + e.getType().toString());
- synchronized (contextListeners) {
- // System.out.println(contextListeners.size());
- for (ContextListener listener : contextListeners) {
- listener.update(e);
- }
- }
+ synchronized (contextListeners) {
+ // System.out.println(contextListeners.size());
+ for (ContextListener listener : contextListeners) {
+ listener.update(e);
+ }
+ }
- }
+ }
- void setVolume(byte[] streamPointer, int volume) {
- synchronized (threadLock) {
- native_set_sink_volume(streamPointer, volume);
- }
More information about the distro-pkg-dev
mailing list