mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-15 10:07:26 -05:00
Track Broadcastify duplicate-rejected calls (#2467)
Co-authored-by: Codex <codex@openai.com>
This commit is contained in:
@@ -36,6 +36,7 @@ public abstract class AbstractAudioBroadcaster<T extends BroadcastConfiguration>
|
|||||||
protected ObjectProperty<BroadcastState> mBroadcastState = new SimpleObjectProperty<>(BroadcastState.READY);
|
protected ObjectProperty<BroadcastState> mBroadcastState = new SimpleObjectProperty<>(BroadcastState.READY);
|
||||||
protected ObjectProperty<BroadcastState> mLastBadBroadcastState = new SimpleObjectProperty<>();
|
protected ObjectProperty<BroadcastState> mLastBadBroadcastState = new SimpleObjectProperty<>();
|
||||||
protected int mStreamedAudioCount = 0;
|
protected int mStreamedAudioCount = 0;
|
||||||
|
protected int mDuplicateRejectedAudioCount = 0;
|
||||||
protected int mErrorAudioCount = 0;
|
protected int mErrorAudioCount = 0;
|
||||||
protected int mAgedOffAudioCount = 0;
|
protected int mAgedOffAudioCount = 0;
|
||||||
|
|
||||||
@@ -163,6 +164,22 @@ public abstract class AbstractAudioBroadcaster<T extends BroadcastConfiguration>
|
|||||||
mStreamedAudioCount++;
|
mStreamedAudioCount++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Number of audio recordings rejected by the remote service as duplicates.
|
||||||
|
*/
|
||||||
|
public int getDuplicateRejectedAudioCount()
|
||||||
|
{
|
||||||
|
return mDuplicateRejectedAudioCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Increments the duplicate-rejected audio count by one.
|
||||||
|
*/
|
||||||
|
public void incrementDuplicateRejectedAudioCount()
|
||||||
|
{
|
||||||
|
mDuplicateRejectedAudioCount++;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Number of audio recordings that were removed for exceeding age limit
|
* Number of audio recordings that were removed for exceeding age limit
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ public class BroadcastEvent
|
|||||||
BROADCASTER_QUEUE_CHANGE,
|
BROADCASTER_QUEUE_CHANGE,
|
||||||
BROADCASTER_STATE_CHANGE,
|
BROADCASTER_STATE_CHANGE,
|
||||||
BROADCASTER_STREAMED_COUNT_CHANGE,
|
BROADCASTER_STREAMED_COUNT_CHANGE,
|
||||||
|
BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE,
|
||||||
BROADCASTER_AGED_OFF_COUNT_CHANGE,
|
BROADCASTER_AGED_OFF_COUNT_CHANGE,
|
||||||
BROADCASTER_ERROR_COUNT_CHANGE,
|
BROADCASTER_ERROR_COUNT_CHANGE,
|
||||||
BROADCASTER_DELETE,
|
BROADCASTER_DELETE,
|
||||||
|
|||||||
@@ -62,11 +62,12 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
|
|||||||
public static final int COLUMN_BROADCASTER_STATUS = 2;
|
public static final int COLUMN_BROADCASTER_STATUS = 2;
|
||||||
public static final int COLUMN_BROADCASTER_QUEUE_SIZE = 3;
|
public static final int COLUMN_BROADCASTER_QUEUE_SIZE = 3;
|
||||||
public static final int COLUMN_BROADCASTER_STREAMED_COUNT = 4;
|
public static final int COLUMN_BROADCASTER_STREAMED_COUNT = 4;
|
||||||
public static final int COLUMN_BROADCASTER_AGED_OFF_COUNT = 5;
|
public static final int COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT = 5;
|
||||||
public static final int COLUMN_BROADCASTER_ERROR_COUNT = 6;
|
public static final int COLUMN_BROADCASTER_AGED_OFF_COUNT = 6;
|
||||||
|
public static final int COLUMN_BROADCASTER_ERROR_COUNT = 7;
|
||||||
|
|
||||||
public static final String[] COLUMN_NAMES = new String[]
|
public static final String[] COLUMN_NAMES = new String[]
|
||||||
{"Stream Type", "Name", "Status", "Queued", "Streamed/Uploaded", "Aged Off", "Upload Error"};
|
{"Stream Type", "Name", "Status", "Queued", "Streamed/Uploaded", "Duplicate Rejected", "Aged Off", "Upload Error"};
|
||||||
|
|
||||||
private ObservableList<ConfiguredBroadcast> mConfiguredBroadcasts =
|
private ObservableList<ConfiguredBroadcast> mConfiguredBroadcasts =
|
||||||
FXCollections.observableArrayList(ConfiguredBroadcast.extractor());
|
FXCollections.observableArrayList(ConfiguredBroadcast.extractor());
|
||||||
@@ -531,6 +532,12 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
|
|||||||
fireTableCellUpdated(row, COLUMN_BROADCASTER_STREAMED_COUNT);
|
fireTableCellUpdated(row, COLUMN_BROADCASTER_STREAMED_COUNT);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE:
|
||||||
|
if(row >= 0)
|
||||||
|
{
|
||||||
|
fireTableCellUpdated(row, COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT);
|
||||||
|
}
|
||||||
|
break;
|
||||||
case BROADCASTER_AGED_OFF_COUNT_CHANGE:
|
case BROADCASTER_AGED_OFF_COUNT_CHANGE:
|
||||||
if(row >= 0)
|
if(row >= 0)
|
||||||
{
|
{
|
||||||
@@ -607,6 +614,12 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
|
|||||||
return configuredBroadcast.getAudioBroadcaster().getStreamedAudioCount();
|
return configuredBroadcast.getAudioBroadcaster().getStreamedAudioCount();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT:
|
||||||
|
if(configuredBroadcast.hasAudioBroadcaster())
|
||||||
|
{
|
||||||
|
return configuredBroadcast.getAudioBroadcaster().getDuplicateRejectedAudioCount();
|
||||||
|
}
|
||||||
|
break;
|
||||||
case COLUMN_BROADCASTER_AGED_OFF_COUNT:
|
case COLUMN_BROADCASTER_AGED_OFF_COUNT:
|
||||||
if(configuredBroadcast.hasAudioBroadcaster())
|
if(configuredBroadcast.hasAudioBroadcaster())
|
||||||
{
|
{
|
||||||
@@ -643,6 +656,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
|
|||||||
case COLUMN_BROADCASTER_AGED_OFF_COUNT:
|
case COLUMN_BROADCASTER_AGED_OFF_COUNT:
|
||||||
case COLUMN_BROADCASTER_QUEUE_SIZE:
|
case COLUMN_BROADCASTER_QUEUE_SIZE:
|
||||||
case COLUMN_BROADCASTER_STREAMED_COUNT:
|
case COLUMN_BROADCASTER_STREAMED_COUNT:
|
||||||
|
case COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT:
|
||||||
case COLUMN_BROADCASTER_ERROR_COUNT:
|
case COLUMN_BROADCASTER_ERROR_COUNT:
|
||||||
return Integer.class;
|
return Integer.class;
|
||||||
case COLUMN_BROADCAST_SERVER_TYPE:
|
case COLUMN_BROADCAST_SERVER_TYPE:
|
||||||
|
|||||||
@@ -370,6 +370,9 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
|
|||||||
else if(urlResponse.startsWith("1 SKIPPED"))
|
else if(urlResponse.startsWith("1 SKIPPED"))
|
||||||
{
|
{
|
||||||
//Broadcastify is telling us to skip audio upload - someone already uploaded it
|
//Broadcastify is telling us to skip audio upload - someone already uploaded it
|
||||||
|
incrementDuplicateRejectedAudioCount();
|
||||||
|
broadcast(new BroadcastEvent(BroadcastifyCallBroadcaster.this,
|
||||||
|
BroadcastEvent.Event.BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE));
|
||||||
audioRecording.removePendingReplay();
|
audioRecording.removePendingReplay();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user