From 5a91630996490c800d302249a2828eaa774f049a Mon Sep 17 00:00:00 2001 From: denny Date: Sat, 10 Oct 2015 06:05:08 -0400 Subject: [PATCH] Updates p25 audio module to use version 0.3.0 of the jmbe audio library --- .classpath | 2 +- ...ace-0.2.1.jar => jmbe-interface-0.3.0.jar} | Bin 16219 -> 16324 bytes .../decode/p25/audio/P25AudioModule.java | 2 +- src/source/mixer/MixerManager.java | 12 ++++-------- 4 files changed, 6 insertions(+), 10 deletions(-) rename imports/{jmbe-interface-0.2.1.jar => jmbe-interface-0.3.0.jar} (76%) 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 9963638a0a2aa5825cb565af50afbc2cba992161..e6a8fcfdcbdf816e82e8a932a7a7b63d48fe9a79 100644 GIT binary patch delta 3214 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 B+^qlr delta 3190 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 a0Q{tfYsPdZ9smII$&5Y$(Jr+gxBme^e5}j> 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(); + } } }