GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge branch 'master' into #82_icon_manager_model

Browse Source
This commit is contained in:
Denny
2017-01-09 18:19:28 -05:00
parent b6498d048a 8a150451c4
commit 1352ef9092
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/module/decode/p25/audio/P25AudioModule.java
View File

@@ -137,13 +137,9 @@ public class P25AudioModule extends Module implements Listener<Message>,
library = (AudioConversionLibrary) temp.newInstance();
if ((library.getMajorVersion() == 0 &&
library.getMinorVersion() >= 3 &&
library.getBuildVersion() >= 3) ||
library.getMajorVersion() >= 1)
if ((library.getMajorVersion() == 0 && library.getMinorVersion() >= 3 &&
library.getBuildVersion() >= 3) || library.getMajorVersion() >= 1)
{
// mAudioConverter = library.getAudioConverter( IMBE_CODEC,
// AudioFormats.PCM_SIGNED_48KHZ_16BITS_MONO );
mAudioConverter = library.getAudioConverter(IMBE_CODEC, AudioFormats.PCM_SIGNED_8KHZ_16BITS_MONO);
if (mAudioConverter != null)
@@ -173,7 +169,7 @@ public class P25AudioModule extends Module implements Listener<Message>,
}
else
{
mLog.warn("JMBE library version 0.3.1 or higher is required - found: " + library.getVersion());
mLog.warn("JMBE library version 0.3.3 or higher is required - found: " + library.getVersion());
}
}
catch (ClassNotFoundException e1)