#1506 Various updates

src/main/java/io/github/dsheirer/controller/channel/ChannelProcessingManager.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 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
@@ -623,30 +623,27 @@ private void stopProcessing(Channel channel) throws ChannelException
                 Platform.runLater(() -> channel.setProcessing(false));
             }
 
-            //Since the processing chain's source will block on stop(), throw it to the thread pool to run
-            ThreadPool.CACHED.submit(() -> {
-                try
-                {
-                    processingChain.stop();
-                    processingChain.removeEventLoggingModules();
-                    processingChain.removeRecordingModules();
+            try
+            {
+                processingChain.stop();
+                processingChain.removeEventLoggingModules();
+                processingChain.removeRecordingModules();
 
-                    //Deregister channel from receive frequency correction events to show in the spectral display (hack!)
-                    processingChain.removeFrequencyChangeListener(channel);
-                    channel.resetFrequencyCorrection();
+                //Deregister channel from receive frequency correction events to show in the spectral display (hack!)
+                processingChain.removeFrequencyChangeListener(channel);
+                channel.resetFrequencyCorrection();
 
-                    mChannelEventBroadcaster.broadcast(new ChannelEvent(channel, ChannelEvent.Event.NOTIFICATION_PROCESSING_STOP));
-                    mChannelEventBroadcaster.removeListener(processingChain);
+                mChannelEventBroadcaster.broadcast(new ChannelEvent(channel, ChannelEvent.Event.NOTIFICATION_PROCESSING_STOP));
+                mChannelEventBroadcaster.removeListener(processingChain);
 
-                    //Unregister for event bus requests and notifications
-                    processingChain.getEventBus().unregister(ChannelProcessingManager.this);
-                    processingChain.dispose();
-                }
-                catch(Exception e)
-                {
-                    mLog.error("Error during shutdown of processing chain for channel [" + channel.getName() + "}", e);
-                }
-            });
+                //Unregister for event bus requests and notifications
+                processingChain.getEventBus().unregister(ChannelProcessingManager.this);
+                processingChain.dispose();
+            }
+            catch(Exception e)
+            {
+                mLog.error("Error during shutdown of processing chain for channel [" + channel.getName() + "}", e);
+            }
         }
     }
 

src/main/java/io/github/dsheirer/dsp/filter/channelizer/AbstractComplexPolyphaseChannelizer.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 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
@@ -122,6 +122,11 @@ public void addChannel(PolyphaseChannelSource polyphaseChannelSource)
             mChannels.add(polyphaseChannelSource);
             mSourceChangeBroadcaster.addListener(polyphaseChannelSource.getSourceEventListener());
         }
+        else
+        {
+            mLog.error("Error adding polyphase channel source - " + (polyphaseChannelSource == null ? "source is null" :
+                    "channel source is already added to this channelizer"));
+        }
     }
 
     /**
@@ -136,6 +141,11 @@ public void removeChannel(PolyphaseChannelSource polyphaseChannelSource)
             mChannels.remove(polyphaseChannelSource);
             mSourceChangeBroadcaster.removeListener(polyphaseChannelSource.getSourceEventListener());
         }
+        else
+        {
+            mLog.error("Error removing polyphase channel source - " + (polyphaseChannelSource == null ? "source is null" :
+                    "channel source was not previously added to this channelizer"));
+        }
     }
 
     /**

src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelManager.java

@@ -27,7 +27,6 @@
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.complex.InterleavedComplexSamples;
 import io.github.dsheirer.source.ISourceEventProcessor;
-import io.github.dsheirer.source.Source;
 import io.github.dsheirer.source.SourceEvent;
 import io.github.dsheirer.source.SourceException;
 import io.github.dsheirer.source.tuner.TunerController;
@@ -175,14 +174,6 @@ public void setErrorMessage(String errorMessage)
         }
     }
 
-    /**
-     * Current channel sample rate which is (2 * channel bandwidth).
-     */
-    public double getChannelSampleRate()
-    {
-        return mChannelCalculator.getChannelSampleRate();
-    }
-
     /**
      * Current channel bandwidth/spacing.
      */
@@ -437,24 +428,17 @@ public void receive(SourceEvent sourceEvent)
                     }
                     break;
                 case REQUEST_STOP_SAMPLE_STREAM:
-                    if(sourceEvent.hasSource() && sourceEvent.getSource() instanceof PolyphaseChannelSource)
+                    if(sourceEvent.hasSource() && sourceEvent.getSource() instanceof PolyphaseChannelSource channelSource)
                     {
-                        stopChannelSource((PolyphaseChannelSource)sourceEvent.getSource());
+                        stopChannelSource(channelSource);
+                        channelSource.dispose();
                     }
                     else
                     {
                         mLog.error("Request to stop sample stream for unrecognized source: " +
                             (sourceEvent.hasSource() ? sourceEvent.getSource().getClass() : "null source"));
                     }
                     break;
-                case REQUEST_SOURCE_DISPOSE:
-                    Source source = sourceEvent.getSource();
-
-                    if(source instanceof PolyphaseChannelSource)
-                    {
-                        source.dispose();
-                    }
-                    break;
                 case NOTIFICATION_MEASURED_FREQUENCY_ERROR_SYNC_LOCKED:
                     //Rebroadcast so that the tuner source can process this event
                     mSourceEventBroadcaster.broadcast(sourceEvent);

src/main/java/io/github/dsheirer/source/SourceEvent.java

@@ -52,7 +52,6 @@ public enum Event
         REQUEST_FREQUENCY_CHANGE,
         REQUEST_FREQUENCY_ROTATION,
         REQUEST_FREQUENCY_SELECTION,
-        REQUEST_SOURCE_DISPOSE,
         REQUEST_CHANGE_SQUELCH_THRESHOLD,
         REQUEST_CURRENT_SQUELCH_THRESHOLD,
         REQUEST_START_SAMPLE_STREAM,
@@ -368,15 +367,6 @@ public static SourceEvent stopSampleStreamNotification(Source source)
         return new SourceEvent(Event.NOTIFICATION_STOP_SAMPLE_STREAM, source);
     }
 
-    /**
-     * Creates a request to dispose of the source.  This is normally used for TunerChannelSource to notify the
-     * parent source manager that the channel is no longer needed
-     */
-    public static SourceEvent sourceDisposeRequest(Source source)
-    {
-        return new SourceEvent(Event.REQUEST_SOURCE_DISPOSE, source);
-    }
-
     /**
      * Creates a request to cycle to the next source frequency.  This is normally used for decoders to request the
      * next frequency in a list when a multiple-frequency source configuration is defined.

src/main/java/io/github/dsheirer/source/tuner/channel/TunerChannelSource.java

@@ -109,7 +109,6 @@ public void start()
     public void stop()
     {
         broadcastProducerSourceEvent(SourceEvent.stopSampleStreamRequest(this));
-        broadcastProducerSourceEvent(SourceEvent.sourceDisposeRequest(this));
     }
 
     @Override

src/main/java/io/github/dsheirer/source/tuner/manager/HeterodyneChannelSourceManager.java

@@ -291,6 +291,7 @@ public void receive(SourceEvent sourceEvent)
         {
             switch(sourceEvent.getEvent())
             {
+//TODO: protect start/stop processing with a reentrant lock
                 case REQUEST_START_SAMPLE_STREAM:
                     if(sourceEvent.getSource() instanceof HalfBandTunerChannelSource)
                     {
@@ -304,19 +305,13 @@ public void receive(SourceEvent sourceEvent)
                     }
                     break;
                 case REQUEST_STOP_SAMPLE_STREAM:
-                    if(sourceEvent.getSource() instanceof HalfBandTunerChannelSource)
+                    if(sourceEvent.getSource() instanceof HalfBandTunerChannelSource halfBandSource)
                     {
-                        mSampleDelayBuffer.removeListener((HalfBandTunerChannelSource)sourceEvent.getSource());
+                        mSampleDelayBuffer.removeListener(halfBandSource);
                         stopDelayBuffer();
-                    }
-                    break;
-                case REQUEST_SOURCE_DISPOSE:
-                    if(sourceEvent.getSource() instanceof HalfBandTunerChannelSource)
-                    {
-                        HalfBandTunerChannelSource channelSource = (HalfBandTunerChannelSource) sourceEvent.getSource();
-                        mChannelSources.remove(channelSource);
-                        mTunerChannels.remove(channelSource.getTunerChannel());
-                        channelSource.dispose();
+                        mChannelSources.remove(halfBandSource);
+                        mTunerChannels.remove(halfBandSource.getTunerChannel());
+                        halfBandSource.dispose();
 
                         //Unlock the tuner controller if there are no more channels
                         if(getTunerChannelCount() == 0)