Updates p25 audio module to use version 0.3.0 of the jmbe audio library

This commit is contained in:
denny
2015-10-10 06:05:08 -04:00
parent 6bf7ec7d81
commit 5a91630996
4 changed files with 6 additions and 10 deletions

View File

@@ -24,6 +24,6 @@
<classpathentry kind="lib" path="imports/logback-classic-1.1.2.jar"/> <classpathentry kind="lib" path="imports/logback-classic-1.1.2.jar"/>
<classpathentry kind="lib" path="imports/logback-core-1.1.2.jar"/> <classpathentry kind="lib" path="imports/logback-core-1.1.2.jar"/>
<classpathentry kind="lib" path="imports/commons-io-2.4.jar"/> <classpathentry kind="lib" path="imports/commons-io-2.4.jar"/>
<classpathentry kind="lib" path="imports/jmbe-interface-0.2.1.jar"/> <classpathentry kind="lib" path="imports/jmbe-interface-0.3.0.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

View File

@@ -104,7 +104,7 @@ public class P25AudioModule extends Module implements Listener<Message>,
{ {
for( byte[] frame: ((LDUMessage)message).getIMBEFrames() ) for( byte[] frame: ((LDUMessage)message).getIMBEFrames() )
{ {
float[] audio = mAudioConverter.convert( frame ); float[] audio = mAudioConverter.decode( frame );
mAudioPacketListener.receive( mAudioPacketListener.receive(
new AudioPacket( audio, mAudioMetadata ) ); new AudioPacket( audio, mAudioMetadata ) );

View File

@@ -434,14 +434,10 @@ public class MixerManager
{ {
return mChannels.contains( channel ); return mChannels.contains( channel );
} }
}
public static void main( String[] args )
{
mLog.debug( "Starting ..." );
MixerManager.getInstance(); public String toString()
{
mLog.debug( "Finished!" ); return mMixer.getMixerInfo().getName();
}
} }
} }