From 25c82d4ab556149335ee9811181edd65dfa495c4 Mon Sep 17 00:00:00 2001 From: Lyubomir Marinov <lyubomir.marinov@jitsi.org> Date: Wed, 2 Oct 2013 09:57:50 +0300 Subject: [PATCH] Fixes warnings, spelling mistakes. --- .../neomedia/device/MacCoreaudioSystem.java | 1 - .../maccoreaudio/MacCoreaudioStream.java | 1 - .../renderer/audio/MacCoreaudioRenderer.java | 24 ++++--------------- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/org/jitsi/impl/neomedia/device/MacCoreaudioSystem.java b/src/org/jitsi/impl/neomedia/device/MacCoreaudioSystem.java index 484c5ae6..20d1e8b3 100644 --- a/src/org/jitsi/impl/neomedia/device/MacCoreaudioSystem.java +++ b/src/org/jitsi/impl/neomedia/device/MacCoreaudioSystem.java @@ -14,7 +14,6 @@ import javax.media.format.*; import org.jitsi.impl.neomedia.*; -import org.jitsi.impl.neomedia.control.*; import org.jitsi.impl.neomedia.jmfext.media.renderer.audio.*; import org.jitsi.util.*; diff --git a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/maccoreaudio/MacCoreaudioStream.java b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/maccoreaudio/MacCoreaudioStream.java index c2777d1d..6c894292 100644 --- a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/maccoreaudio/MacCoreaudioStream.java +++ b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/maccoreaudio/MacCoreaudioStream.java @@ -16,7 +16,6 @@ import org.jitsi.impl.neomedia.*; import org.jitsi.impl.neomedia.codec.*; -import org.jitsi.impl.neomedia.control.*; import org.jitsi.impl.neomedia.device.*; import org.jitsi.impl.neomedia.jmfext.media.protocol.*; import org.jitsi.service.neomedia.*; diff --git a/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/MacCoreaudioRenderer.java b/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/MacCoreaudioRenderer.java index 30c381c1..c5a30e1b 100644 --- a/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/MacCoreaudioRenderer.java +++ b/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/MacCoreaudioRenderer.java @@ -7,7 +7,6 @@ package org.jitsi.impl.neomedia.jmfext.media.renderer.audio; import java.beans.*; -import java.lang.reflect.*; import java.util.*; import java.util.concurrent.locks.*; @@ -15,12 +14,8 @@ import javax.media.format.*; import org.jitsi.impl.neomedia.*; -import org.jitsi.impl.neomedia.control.*; import org.jitsi.impl.neomedia.device.*; import org.jitsi.service.neomedia.*; -import org.jitsi.util.*; - -import java.nio.ByteBuffer; /** * Implements an audio <tt>Renderer</tt> which uses MacOSX Coreaudio. @@ -30,13 +25,6 @@ public class MacCoreaudioRenderer extends AbstractAudioRenderer<MacCoreaudioSystem> { - /** - * The <tt>Logger</tt> used by the <tt>MacCoreaudioRenderer</tt> class and - * its instances for logging output. - */ - private static final Logger logger - = Logger.getLogger(MacCoreaudioRenderer.class); - /** * The device used for this renderer. */ @@ -48,13 +36,13 @@ public class MacCoreaudioRenderer private long stream = 0; /** - * A mutual eclusion used to avoid conflict when starting / stoping the + * A mutual exclusion used to avoid conflict when starting / stopping the * stream for this renderer; */ private Object startStopMutex = new Object(); /** - * The buffer which stores th incoming data before sending them to + * The buffer which stores the incoming data before sending them to * CoreAudio. */ private byte[] buffer = null; @@ -232,8 +220,7 @@ public Format[] getSupportedInputFormats() { if (supportedInputFormats == null) { - MediaLocator locator = getLocator(); - this.updateDeviceUID(); + updateDeviceUID(); if(deviceUID == null) { @@ -539,7 +526,6 @@ public void writeOutput(byte[] buffer, int bufferLength) { updateBufferLength(bufferLength); - int i = 0; int length = nbBufferData; if(bufferLength < length) { @@ -566,7 +552,7 @@ public void writeOutput(byte[] buffer, int bufferLength) nbBufferData); } // If the stop process is waiting, notifies that every - // sample has been consummed (nbBufferData == 0). + // sample has been consumed (nbBufferData == 0). else { startStopMutex.notify(); @@ -604,7 +590,7 @@ private boolean updateDeviceUID() } /** - * Increases the buffer length if necessary: if the new legnth is greater + * Increases the buffer length if necessary: if the new length is greater * than the current buffer length. * * @param newLength The new length requested. -- GitLab