diff --git a/.idea/dictionaries/denny.xml b/.idea/dictionaries/denny.xml new file mode 100644 index 00000000..fc474e43 --- /dev/null +++ b/.idea/dictionaries/denny.xml @@ -0,0 +1,31 @@ + + + + bahroo + broadcastify + correlator + dinf + esnid + fleetsync + heterdyned + heterodynes + icecast + ident + nutall + overflowable + polyphase + remez + resampler + samplerate + sdrtrunk + sheirer + shoutcast + streamable + talkgroup + tgid + ultravox + wacn + xtea + + + \ No newline at end of file diff --git a/.idea/libraries/imports.xml b/.idea/libraries/imports.xml new file mode 100644 index 00000000..b90eef82 --- /dev/null +++ b/.idea/libraries/imports.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 05483570..d5d79e0c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7f..fef64bf1 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,5 +1,15 @@ + + + diff --git a/copyright_header.txt b/copyright_header.txt deleted file mode 100644 index 3eaea8b8..00000000 --- a/copyright_header.txt +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * SDR Trunk - * Copyright (C) 2014-2016 Dennis Sheirer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - ******************************************************************************/ diff --git a/imports/commons-math3-3.6.1.jar b/imports/commons-math3-3.6.1.jar new file mode 100644 index 00000000..0ff582cf Binary files /dev/null and b/imports/commons-math3-3.6.1.jar differ diff --git a/sdrtrunk.iml b/sdrtrunk.iml new file mode 100644 index 00000000..390626c0 --- /dev/null +++ b/sdrtrunk.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/io/github/dsheirer/audio/AudioManager.java b/src/main/java/io/github/dsheirer/audio/AudioManager.java index c0f1d877..e48cf36a 100644 --- a/src/main/java/io/github/dsheirer/audio/AudioManager.java +++ b/src/main/java/io/github/dsheirer/audio/AudioManager.java @@ -24,6 +24,7 @@ import io.github.dsheirer.audio.output.StereoAudioOutput; import io.github.dsheirer.properties.SystemProperties; import io.github.dsheirer.sample.Broadcaster; import io.github.dsheirer.sample.Listener; +import io.github.dsheirer.sample.buffer.ReusableAudioPacket; import io.github.dsheirer.source.mixer.MixerChannel; import io.github.dsheirer.source.mixer.MixerChannelConfiguration; import io.github.dsheirer.source.mixer.MixerManager; @@ -43,7 +44,7 @@ import java.util.concurrent.LinkedTransferQueue; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -public class AudioManager implements Listener, IAudioController +public class AudioManager implements Listener, IAudioController { private static final Logger mLog = LoggerFactory.getLogger(AudioManager.class); @@ -58,7 +59,7 @@ public class AudioManager implements Listener, IAudioController public static final AudioEvent CONFIGURATION_CHANGE_COMPLETE = new AudioEvent(AudioEvent.Type.AUDIO_CONFIGURATION_CHANGE_COMPLETE, null); - private LinkedTransferQueue mAudioPacketQueue = new LinkedTransferQueue<>(); + private LinkedTransferQueue mAudioPacketQueue = new LinkedTransferQueue<>(); private Map mChannelConnectionMap = new HashMap<>(); private List mAudioOutputConnections = new ArrayList<>(); private AudioOutputConnection mLowestPriorityConnection; @@ -170,7 +171,7 @@ public class AudioManager implements Listener, IAudioController * Primary ingest point for audio produced by all decoding channels, for distribution to audio playback devices. */ @Override - public synchronized void receive(AudioPacket packet) + public synchronized void receive(ReusableAudioPacket packet) { mAudioPacketQueue.add(packet); } @@ -362,7 +363,7 @@ public class AudioManager implements Listener, IAudioController * @param audioPacket from a decoding channel source * @return an audio output connection or null */ - private AudioOutputConnection getConnection(AudioPacket audioPacket) + private AudioOutputConnection getConnection(ReusableAudioPacket audioPacket) { int channelMetadataID = audioPacket.getMetadata().getMetadataID(); @@ -410,6 +411,8 @@ public class AudioManager implements Listener, IAudioController public class AudioPacketProcessor implements Runnable { + private List mPackets = new ArrayList<>(); + @Override public void run() { @@ -419,14 +422,12 @@ public class AudioManager implements Listener, IAudioController if(mAudioPacketQueue != null) { - List packets = new ArrayList(); + mAudioPacketQueue.drainTo(mPackets); - mAudioPacketQueue.drainTo(packets); - - for(AudioPacket packet : packets) + for(ReusableAudioPacket packet : mPackets) { /* Don't process any packet's marked as do not monitor */ - if(!packet.getMetadata().isDoNotMonitor() && packet.getType() == AudioPacket.Type.AUDIO) + if(!packet.getMetadata().isDoNotMonitor() && packet.getType() == ReusableAudioPacket.Type.AUDIO) { AudioOutputConnection connection = getConnection(packet); @@ -434,13 +435,29 @@ public class AudioManager implements Listener, IAudioController { connection.receive(packet); } + else + { + packet.decrementUserCount(); + } + } + else + { + packet.decrementUserCount(); } } + + mPackets.clear(); } } catch(Exception e) { mLog.error("Encountered error while processing audio packets", e); + + while(mPackets.size() > 0) + { + ReusableAudioPacket audioPacket = mPackets.remove(0); + audioPacket.decrementUserCount(); + } } } } @@ -463,7 +480,7 @@ public class AudioManager implements Listener, IAudioController mAudioOutput = audioOutput; } - public void receive(AudioPacket packet) + public void receive(ReusableAudioPacket packet) { if(packet.hasMetadata() && packet.getMetadata().getMetadataID() == mChannelMetadataID) { diff --git a/src/main/java/io/github/dsheirer/audio/AudioModule.java b/src/main/java/io/github/dsheirer/audio/AudioModule.java index 369dd8ed..b11f8cb0 100644 --- a/src/main/java/io/github/dsheirer/audio/AudioModule.java +++ b/src/main/java/io/github/dsheirer/audio/AudioModule.java @@ -1,19 +1,16 @@ /******************************************************************************* - * sdrtrunk - * Copyright (C) 2014-2017 Dennis Sheirer + * sdr-trunk + * Copyright (C) 2014-2018 Dennis Sheirer * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see + * You should have received a copy of the GNU General Public License along with this program. + * If not, see * ******************************************************************************/ package io.github.dsheirer.audio; @@ -23,92 +20,80 @@ import io.github.dsheirer.audio.squelch.SquelchState; import io.github.dsheirer.channel.metadata.Metadata; import io.github.dsheirer.dsp.filter.design.FilterDesignException; import io.github.dsheirer.dsp.filter.fir.FIRFilterSpecification; +import io.github.dsheirer.dsp.filter.fir.real.RealFIRFilter2; import io.github.dsheirer.dsp.filter.fir.remez.RemezFIRFilterDesigner; -import io.github.dsheirer.dsp.filter.polyphase.PolyphaseFIRDecimatingFilter_RB; import io.github.dsheirer.module.Module; import io.github.dsheirer.sample.Listener; -import io.github.dsheirer.sample.real.IFilteredRealBufferListener; -import io.github.dsheirer.sample.real.RealBuffer; +import io.github.dsheirer.sample.buffer.IReusableBufferListener; +import io.github.dsheirer.sample.buffer.ReusableAudioPacket; +import io.github.dsheirer.sample.buffer.ReusableAudioPacketQueue; +import io.github.dsheirer.sample.buffer.ReusableBuffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.ScheduledExecutorService; - /** - * Provides packaging of demodulated audio sample buffers into audio packets for - * broadcast to registered audio packet listeners. Includes audio packet - * metadata in constructed audio packets. + * Provides packaging of demodulated audio sample buffers into audio packets for broadcast to registered audio packet + * listeners. Includes audio packet metadata in constructed audio packets. * - * Incorporates audio squelch state listener to control if audio packets are - * broadcast or ignored. + * Incorporates audio squelch state listener to control if audio packets are broadcast or ignored. + * + * This class is designed to support 8 kHz sample rate demodulated audio. */ -public class AudioModule extends Module implements IAudioPacketProvider, IFilteredRealBufferListener, - ISquelchStateListener, Listener +public class AudioModule extends Module implements IAudioPacketProvider, IReusableBufferListener, + ISquelchStateListener, Listener { protected static final Logger mLog = LoggerFactory.getLogger(AudioModule.class); + private ReusableAudioPacketQueue mAudioPacketQueue = new ReusableAudioPacketQueue("AudioModule"); - private static float[] mDecimationCoefficients; + private static float[] sHighPassFilterCoefficients; static { - //Band-pass filter to both decimate (48kHz to 8kHz) and block 0 - 300 Hz (LTR signalling). - FIRFilterSpecification specification = FIRFilterSpecification.bandPassBuilder() - .sampleRate(48000) - .stopFrequency1(150) - .passFrequencyBegin(300) - .passFrequencyEnd(3500) - .stopFrequency2(4000) - .stopRipple(0.0004) - .passRipple(0.008) + FIRFilterSpecification specification = FIRFilterSpecification.highPassBuilder() + .sampleRate(8000) + .stopBandCutoff(200) + .stopBandAmplitude(0.0) + .stopBandRipple(0.025) + .passBandStart(300) + .passBandAmplitude(1.0) + .passBandRipple(0.01) .build(); - - RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner(specification); - try { - if(!designer.isValid()) - { - throw new FilterDesignException("Couldn't design the audio decimation filter"); - } + RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner(specification); - mDecimationCoefficients = designer.getImpulseResponse(); + if(designer.isValid()) + { + sHighPassFilterCoefficients = designer.getImpulseResponse(); + } } - catch(FilterDesignException e) + catch(FilterDesignException fde) { - mLog.debug("Error designing filter", e); + mLog.error("Filter design error", fde); } } + private RealFIRFilter2 mHighPassFilter = new RealFIRFilter2(sHighPassFilterCoefficients); private SquelchStateListener mSquelchStateListener = new SquelchStateListener(); private SquelchState mSquelchState = SquelchState.SQUELCH; - private Listener mAudioPacketListener; - private PolyphaseFIRDecimatingFilter_RB mAudioDecimationFilter; + private Listener mAudioPacketListener; private Metadata mMetadata; + /** + * Creates an Audio Module. + * + * @param metadata to use for audio packets produced by this audio module. + */ public AudioModule(Metadata metadata) { mMetadata = metadata; - - mAudioDecimationFilter = new PolyphaseFIRDecimatingFilter_RB(mDecimationCoefficients, 6, 2.0f); - mAudioDecimationFilter.setListener(new Listener() - { - @Override - public void receive(RealBuffer realBuffer) - { - if(mAudioPacketListener != null) - { - AudioPacket packet = new AudioPacket(realBuffer.getSamples(), mMetadata.copyOf()); - mAudioPacketListener.receive(packet); - } - } - }); } @Override public void dispose() { - mSquelchStateListener = null; mAudioPacketListener = null; + mSquelchStateListener = null; } @Override @@ -117,7 +102,7 @@ public class AudioModule extends Module implements IAudioPacketProvider, IFilter } @Override - public void start(ScheduledExecutorService executor) + public void start() { /* No start operations provided */ } @@ -125,34 +110,18 @@ public class AudioModule extends Module implements IAudioPacketProvider, IFilter @Override public void stop() { - /* Issue an end audio packet in case a recorder is still rolling */ + /* Issue an end-audio packet in case a recorder is still rolling */ if(mAudioPacketListener != null) { - mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mMetadata.copyOf())); - } - } - - /** - * Processes demodulated audio samples into audio packets with current audio - * metadata and sends to the registered listener - */ - @Override - public void receive(RealBuffer buffer) - { - if(mAudioPacketListener != null && mSquelchState == SquelchState.UNSQUELCH) - { - mAudioDecimationFilter.receive(buffer); + ReusableAudioPacket endAudioPacket = mAudioPacketQueue.getEndAudioBuffer(); + endAudioPacket.setMetadata(mMetadata.copyOf()); + endAudioPacket.incrementUserCount(); + mAudioPacketListener.receive(endAudioPacket); } } @Override - public Listener getFilteredRealBufferListener() - { - return this; - } - - @Override - public void setAudioPacketListener(Listener listener) + public void setAudioPacketListener(Listener listener) { mAudioPacketListener = listener; } @@ -169,6 +138,34 @@ public class AudioModule extends Module implements IAudioPacketProvider, IFilter return mSquelchStateListener; } + @Override + public void receive(ReusableBuffer reusableBuffer) + { + if(mAudioPacketListener != null && mSquelchState == SquelchState.UNSQUELCH) + { + ReusableBuffer highPassFiltered = mHighPassFilter.filter(reusableBuffer); + + ReusableAudioPacket audioPacket = mAudioPacketQueue.getBuffer(highPassFiltered.getSampleCount()); + audioPacket.loadAudioFrom(highPassFiltered); + audioPacket.setMetadata(mMetadata.copyOf()); + + mAudioPacketListener.receive(audioPacket); + + highPassFiltered.decrementUserCount(); + } + else + { + reusableBuffer.decrementUserCount(); + } + } + + @Override + public Listener getReusableBufferListener() + { + //Redirect received reusable buffers to the receive(buffer) method + return this; + } + /** * Wrapper for squelch state listener */ @@ -179,7 +176,9 @@ public class AudioModule extends Module implements IAudioPacketProvider, IFilter { if(state == SquelchState.SQUELCH && mAudioPacketListener != null) { - mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mMetadata.copyOf())); + ReusableAudioPacket endAudioPacket = mAudioPacketQueue.getEndAudioBuffer(); + endAudioPacket.setMetadata(mMetadata.copyOf()); + mAudioPacketListener.receive(endAudioPacket); } mSquelchState = state; diff --git a/src/main/java/io/github/dsheirer/audio/AudioPacket.java b/src/main/java/io/github/dsheirer/audio/AudioPacket.java deleted file mode 100644 index a57f2bdb..00000000 --- a/src/main/java/io/github/dsheirer/audio/AudioPacket.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * sdrtrunk - * Copyright (C) 2014-2017 Dennis Sheirer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - * - ******************************************************************************/ -package io.github.dsheirer.audio; - -import io.github.dsheirer.channel.metadata.Metadata; -import io.github.dsheirer.sample.real.RealBuffer; - -public class AudioPacket -{ - private Type mType; - private RealBuffer mAudioData; - private Metadata mMetadata; - - public AudioPacket(Type type, Metadata metadata) - { - mType = type; - mMetadata = metadata; - } - - public AudioPacket(float[] audio, Metadata metadata) - { - this(Type.AUDIO, metadata); - - mAudioData = new RealBuffer(audio); - } - - public boolean hasMetadata() - { - return mMetadata != null; - } - - public Metadata getMetadata() - { - return mMetadata; - } - - public void setMetadata(Metadata metadata) - { - mMetadata = metadata; - } - - public Type getType() - { - return mType; - } - - public RealBuffer getAudioBuffer() - { - return mAudioData; - } - - public boolean hasAudioBuffer() - { - return mAudioData != null; - } - - public enum Type - { - AUDIO, - END; - } -} diff --git a/src/main/java/io/github/dsheirer/audio/AudioPacketRateCounter.java b/src/main/java/io/github/dsheirer/audio/AudioPacketRateCounter.java deleted file mode 100644 index fbc7ea0d..00000000 --- a/src/main/java/io/github/dsheirer/audio/AudioPacketRateCounter.java +++ /dev/null @@ -1,55 +0,0 @@ -package io.github.dsheirer.audio; - -import io.github.dsheirer.sample.Listener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AudioPacketRateCounter implements Listener -{ - private final static Logger mLog = - LoggerFactory.getLogger( AudioPacketRateCounter.class ); - - private Listener mListener; - private long mCount; - private long mStartTime = -1; - - private String mName; - - public AudioPacketRateCounter() - { - mName = "UNNAMED"; - } - - public AudioPacketRateCounter( String name ) - { - mName = name; - } - - @Override - public void receive( AudioPacket packet ) - { - if( mStartTime == -1 ) - { - mStartTime = System.currentTimeMillis(); - } - - mCount += packet.getAudioBuffer().getSamples().length; - - long elapsed = System.currentTimeMillis() - mStartTime; - - if( elapsed != 0 ) - { - mLog.debug( "[" + mName + "] Audio Rate: " + ( mCount / elapsed ) + " kHz" ); - } - - if( mListener != null ) - { - mListener.receive( packet ); - } - } - - public void setListener( Listener listener ) - { - mListener = listener; - } -} diff --git a/src/main/java/io/github/dsheirer/audio/AudioUtils.java b/src/main/java/io/github/dsheirer/audio/AudioUtils.java index 08b4d3d8..1eca2361 100644 --- a/src/main/java/io/github/dsheirer/audio/AudioUtils.java +++ b/src/main/java/io/github/dsheirer/audio/AudioUtils.java @@ -1,24 +1,22 @@ /******************************************************************************* - * sdrtrunk - * Copyright (C) 2014-2016 Dennis Sheirer + * sdr-trunk + * Copyright (C) 2014-2018 Dennis Sheirer * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see + * You should have received a copy of the GNU General Public License along with this program. + * If not, see * ******************************************************************************/ package io.github.dsheirer.audio; import io.github.dsheirer.sample.ConversionUtils; +import io.github.dsheirer.sample.buffer.ReusableAudioPacket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,17 +32,18 @@ public class AudioUtils /** * Converts the audio packets into a byte array of 16-bit, little-endian audio samples */ - public static byte[] convertTo16BitSamples(List audioPackets) + public static byte[] convertTo16BitSamples(List audioPackets) { ByteArrayOutputStream stream = new ByteArrayOutputStream(); try { - for(AudioPacket packet: audioPackets) + for(ReusableAudioPacket audioPacket: audioPackets) { //Converting from 32-bit floats to signed 16-bit samples - ByteBuffer buffer = ConversionUtils.convertToSigned16BitSamples(packet.getAudioBuffer().getSamples()); + ByteBuffer buffer = ConversionUtils.convertToSigned16BitSamples(audioPacket.getAudioSamples()); stream.write(buffer.array()); + audioPacket.decrementUserCount(); } } catch(IOException e) diff --git a/src/main/java/io/github/dsheirer/audio/IAudioPacketListener.java b/src/main/java/io/github/dsheirer/audio/IAudioPacketListener.java index 96833a73..76452704 100644 --- a/src/main/java/io/github/dsheirer/audio/IAudioPacketListener.java +++ b/src/main/java/io/github/dsheirer/audio/IAudioPacketListener.java @@ -1,8 +1,9 @@ package io.github.dsheirer.audio; import io.github.dsheirer.sample.Listener; +import io.github.dsheirer.sample.buffer.ReusableAudioPacket; public interface IAudioPacketListener { - public Listener getAudioPacketListener(); + public Listener getAudioPacketListener(); } diff --git a/src/main/java/io/github/dsheirer/audio/IAudioPacketProvider.java b/src/main/java/io/github/dsheirer/audio/IAudioPacketProvider.java index b6623cee..7fc00a58 100644 --- a/src/main/java/io/github/dsheirer/audio/IAudioPacketProvider.java +++ b/src/main/java/io/github/dsheirer/audio/IAudioPacketProvider.java @@ -1,9 +1,10 @@ package io.github.dsheirer.audio; import io.github.dsheirer.sample.Listener; +import io.github.dsheirer.sample.buffer.ReusableAudioPacket; public interface IAudioPacketProvider { - public void setAudioPacketListener( Listener listener ); + public void setAudioPacketListener( Listener listener ); public void removeAudioPacketListener(); } diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java index fc7c9eac..986306fd 100644 --- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java +++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java @@ -19,12 +19,12 @@ package io.github.dsheirer.audio.broadcast; import io.github.dsheirer.alias.id.broadcast.BroadcastChannel; -import io.github.dsheirer.audio.AudioPacket; import io.github.dsheirer.channel.metadata.Metadata; import io.github.dsheirer.icon.IconManager; import io.github.dsheirer.properties.SystemProperties; import io.github.dsheirer.sample.Broadcaster; import io.github.dsheirer.sample.Listener; +import io.github.dsheirer.sample.buffer.ReusableAudioPacket; import io.github.dsheirer.util.ThreadPool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ import java.util.function.Consumer; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class BroadcastModel extends AbstractTableModel implements Listener +public class BroadcastModel extends AbstractTableModel implements Listener { private final static Logger mLog = LoggerFactory.getLogger(BroadcastModel.class); @@ -276,7 +276,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener