mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 02:57:35 -05:00
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
@@ -81,6 +81,9 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
|
|||||||
MyEventBus.getEventBus().register(this);
|
MyEventBus.getEventBus().register(this);
|
||||||
|
|
||||||
MixerChannelConfiguration configuration = mUserPreferences.getPlaybackPreference().getMixerChannelConfiguration();
|
MixerChannelConfiguration configuration = mUserPreferences.getPlaybackPreference().getMixerChannelConfiguration();
|
||||||
|
|
||||||
|
if(configuration != null)
|
||||||
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
setMixerChannelConfiguration(configuration);
|
setMixerChannelConfiguration(configuration);
|
||||||
@@ -92,6 +95,11 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
|
|||||||
(configuration != null ? configuration.getMixerChannel().name() : "null") + "]", ae);
|
(configuration != null ? configuration.getMixerChannel().name() : "null") + "]", ae);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mLog.warn("No audio output devices available");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Receives audio segments from channel audio modules.
|
* Receives audio segments from channel audio modules.
|
||||||
|
|||||||
@@ -350,6 +350,8 @@ public class PlaybackPreference extends Preference
|
|||||||
{
|
{
|
||||||
MixerChannelConfiguration defaultConfig = MixerManager.getDefaultOutputMixer();
|
MixerChannelConfiguration defaultConfig = MixerManager.getDefaultOutputMixer();
|
||||||
|
|
||||||
|
if(defaultConfig != null)
|
||||||
|
{
|
||||||
String configName = mPreferences.get(PREFERENCE_KEY_MIXER_CHANNEL_CONFIG, defaultConfig.toString());
|
String configName = mPreferences.get(PREFERENCE_KEY_MIXER_CHANNEL_CONFIG, defaultConfig.toString());
|
||||||
|
|
||||||
for(MixerChannelConfiguration config: MixerManager.getOutputMixers())
|
for(MixerChannelConfiguration config: MixerManager.getOutputMixers())
|
||||||
@@ -365,6 +367,11 @@ public class PlaybackPreference extends Preference
|
|||||||
mMixerChannelConfiguration = defaultConfig;
|
mMixerChannelConfiguration = defaultConfig;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mLog.error("Error - no system audio devices available");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return mMixerChannelConfiguration;
|
return mMixerChannelConfiguration;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -105,6 +105,19 @@ public class AudioRecordingManager implements Listener<AudioSegment>
|
|||||||
*/
|
*/
|
||||||
public void processCompletedAudioSegment(AudioSegment audioSegment)
|
public void processCompletedAudioSegment(AudioSegment audioSegment)
|
||||||
{
|
{
|
||||||
|
//Debug
|
||||||
|
if(audioSegment.getAudioBufferCount() == 0)
|
||||||
|
{
|
||||||
|
mLog.debug("Audio Segment detected with 0 audio buffers");
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Identifier> toIdentifiers = audioSegment.getIdentifierCollection().getIdentifiers(Role.TO);
|
||||||
|
|
||||||
|
if(toIdentifiers.isEmpty())
|
||||||
|
{
|
||||||
|
mLog.debug("Audio Segment detected with NO TO identifiers");
|
||||||
|
}
|
||||||
|
|
||||||
if(audioSegment.recordAudioProperty().get())
|
if(audioSegment.recordAudioProperty().get())
|
||||||
{
|
{
|
||||||
mCompletedAudioSegmentQueue.add(audioSegment);
|
mCompletedAudioSegmentQueue.add(audioSegment);
|
||||||
|
|||||||
Reference in New Issue
Block a user