diff --git a/.classpath b/.classpath index 8022163d..73e0ed80 100644 --- a/.classpath +++ b/.classpath @@ -24,6 +24,6 @@ - + diff --git a/imports/jmbe-interface-0.2.1.jar b/imports/jmbe-interface-0.3.0.jar similarity index 76% rename from imports/jmbe-interface-0.2.1.jar rename to imports/jmbe-interface-0.3.0.jar index 9963638a..e6a8fcfd 100644 Binary files a/imports/jmbe-interface-0.2.1.jar and b/imports/jmbe-interface-0.3.0.jar differ diff --git a/src/module/decode/p25/audio/P25AudioModule.java b/src/module/decode/p25/audio/P25AudioModule.java index bd68ff3f..7a89b72e 100644 --- a/src/module/decode/p25/audio/P25AudioModule.java +++ b/src/module/decode/p25/audio/P25AudioModule.java @@ -104,7 +104,7 @@ public class P25AudioModule extends Module implements Listener, { for( byte[] frame: ((LDUMessage)message).getIMBEFrames() ) { - float[] audio = mAudioConverter.convert( frame ); + float[] audio = mAudioConverter.decode( frame ); mAudioPacketListener.receive( new AudioPacket( audio, mAudioMetadata ) ); diff --git a/src/source/mixer/MixerManager.java b/src/source/mixer/MixerManager.java index 7e05e07a..298e760d 100644 --- a/src/source/mixer/MixerManager.java +++ b/src/source/mixer/MixerManager.java @@ -434,14 +434,10 @@ public class MixerManager { return mChannels.contains( channel ); } - } - - public static void main( String[] args ) - { - mLog.debug( "Starting ..." ); - MixerManager.getInstance(); - - mLog.debug( "Finished!" ); + public String toString() + { + return mMixer.getMixerInfo().getName(); + } } }