Fix code style and errors

This commit is contained in:
Jonas Kvinge
2019-04-08 18:46:11 +02:00
parent 0ce5b50950
commit 9be161d165
58 changed files with 146 additions and 146 deletions

View File

@@ -41,7 +41,6 @@ AlsaDeviceFinder::AlsaDeviceFinder()
QList<DeviceFinder::Device> AlsaDeviceFinder::ListDevices() {
QList<Device> ret;
int result = -1;
snd_pcm_stream_name(SND_PCM_STREAM_PLAYBACK);
@@ -50,7 +49,7 @@ QList<DeviceFinder::Device> AlsaDeviceFinder::ListDevices() {
snd_ctl_card_info_alloca(&cardinfo);
while (true) {
result = snd_card_next(&card);
int result = snd_card_next(&card);
if (result < 0) {
qLog(Error) << "Unable to get soundcard:" << snd_strerror(result);
break;

View File

@@ -52,6 +52,7 @@ Engine::Base::Base()
crossfade_enabled_(true),
autocrossfade_enabled_(false),
crossfade_same_album_(false),
fadeout_pause_enabled_(false),
fadeout_duration_(2),
fadeout_duration_nanosec_(2 * kNsecPerSec),
about_to_end_emitted_(false) {}

View File

@@ -367,10 +367,10 @@ EngineBase::OutputDetailsList GstEngine::GetOutputsList() const {
output.name = plugin.name;
output.description = plugin.description;
if (plugin.name == kAutoSink) output.iconname = "soundcard";
else if ((plugin.name == kALSASink) || (plugin.name == kOSS4Sink) || (plugin.name == kOSS4Sink)) output.iconname = "alsa";
else if (plugin.name== kJackAudioSink) output.iconname = "jack";
else if (plugin.name == kALSASink || plugin.name == kOSS4Sink) output.iconname = "alsa";
else if (plugin.name == kJackAudioSink) output.iconname = "jack";
else if (plugin.name == kPulseSink) output.iconname = "pulseaudio";
else if ((plugin.name == kA2DPSink) || (plugin.name == kAVDTPSink)) output.iconname = "bluetooth";
else if (plugin.name == kA2DPSink || plugin.name == kAVDTPSink) output.iconname = "bluetooth";
else output.iconname = "soundcard";
ret.append(output);
}

View File

@@ -89,6 +89,7 @@ GstEnginePipeline::GstEnginePipeline(GstEngine *engine)
next_uri_set_(false),
volume_percent_(100),
volume_modifier_(1.0),
use_fudge_timer_(false),
pipeline_(nullptr),
audiobin_(nullptr),
queue_(nullptr),

View File

@@ -183,7 +183,6 @@ EngineBase::OutputDetailsList PhononEngine::GetOutputsList() const {
bool PhononEngine::ValidOutput(const QString &output) {
return (output == "auto" || output == "" || output == DefaultOutput());
return(false);
}