Castopod/kasts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable debug output in audiomanager

Browse Source
This commit is contained in:
Bart De Vries 2021-04-19 16:49:46 +02:00
parent 423409403e
commit 7be1ed28ec
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/audiomanager.cpp
View File

@ -93,7 +93,7 @@ QUrl AudioManager::source() const
QMediaPlayer::Error AudioManager::error() const QMediaPlayer::Error AudioManager::error() const
{ {
if (d->m_player.error() != QMediaPlayer::NoError) { if (d->m_player.error() != QMediaPlayer::NoError) {
qDebug() << "AudioManager::error" << d->m_player.errorString(); //qDebug() << "AudioManager::error" << d->m_player.errorString();
} }
return d->m_player.error(); return d->m_player.error();
@ -165,25 +165,25 @@ void AudioManager::setEntry(Entry* entry)
// First check if the previous track needs to be marked as read // First check if the previous track needs to be marked as read
// TODO: make grace time a setting in SettingsManager // TODO: make grace time a setting in SettingsManager
if (d->m_entry) { if (d->m_entry) {
qDebug() << "Checking previous track"; //qDebug() << "Checking previous track";
qDebug() << "Left time" << (duration()-position()); //qDebug() << "Left time" << (duration()-position());
qDebug() << "MediaStatus" << d->m_player.mediaStatus(); //qDebug() << "MediaStatus" << d->m_player.mediaStatus();
if (( (duration()-position()) < 15000) if (( (duration()-position()) < 15000)
|| (d->m_player.mediaStatus() == QMediaPlayer::EndOfMedia) ) { || (d->m_player.mediaStatus() == QMediaPlayer::EndOfMedia) ) {
qDebug() << "Mark as read:" << d->m_entry->title(); //qDebug() << "Mark as read:" << d->m_entry->title();
d->m_entry->setRead(true); d->m_entry->setRead(true);
d->m_entry->enclosure()->setPlayPosition(0); d->m_entry->enclosure()->setPlayPosition(0);
d->m_entry->setQueueStatus(false); // i.e. remove from queue TODO: make this a choice in settings d->m_entry->setQueueStatus(false); // i.e. remove from queue TODO: make this a choice in settings
} }
} }
if (entry != nullptr) { if (entry != nullptr) {
qDebug() << "Going to change source"; //qDebug() << "Going to change source";
d->m_entry = entry; d->m_entry = entry;
Q_EMIT entryChanged(entry); Q_EMIT entryChanged(entry);
d->m_player.setMedia(QUrl(QStringLiteral("file://")+d->m_entry->enclosure()->path())); d->m_player.setMedia(QUrl(QStringLiteral("file://")+d->m_entry->enclosure()->path()));
// save the current playing track in the settingsfile for restoring on startup // save the current playing track in the settingsfile for restoring on startup
DataManager::instance().setLastPlayingEntry(d->m_entry->id()); DataManager::instance().setLastPlayingEntry(d->m_entry->id());
qDebug() << "Changed source to" << d->m_entry->title(); //qDebug() << "Changed source to" << d->m_entry->title();
qint64 startingPosition = d->m_entry->enclosure()->playPosition(); qint64 startingPosition = d->m_entry->enclosure()->playPosition();
// What follows is a dirty hack to get the player positioned at the // What follows is a dirty hack to get the player positioned at the
@ -201,7 +201,7 @@ void AudioManager::setEntry(Entry* entry)
timer.setInterval(2000); timer.setInterval(2000);
loop.connect(&timer, SIGNAL (timeout()), &loop, SLOT (quit()) ); loop.connect(&timer, SIGNAL (timeout()), &loop, SLOT (quit()) );
loop.connect(&d->m_player, SIGNAL (seekableChanged(bool)), &loop, SLOT (quit())); loop.connect(&d->m_player, SIGNAL (seekableChanged(bool)), &loop, SLOT (quit()));
qDebug() << "Starting waiting loop"; //qDebug() << "Starting waiting loop";
loop.exec(); loop.exec();
} }
if (d->m_player.mediaStatus() != QMediaPlayer::BufferedMedia) { if (d->m_player.mediaStatus() != QMediaPlayer::BufferedMedia) {
@ -211,9 +211,9 @@ void AudioManager::setEntry(Entry* entry)
timer.setInterval(2000); timer.setInterval(2000);
loop.connect(&timer, SIGNAL (timeout()), &loop, SLOT (quit()) ); loop.connect(&timer, SIGNAL (timeout()), &loop, SLOT (quit()) );
loop.connect(&d->m_player, SIGNAL (mediaStatusChanged(QMediaPlayer::MediaStatus)), &loop, SLOT (quit())); loop.connect(&d->m_player, SIGNAL (mediaStatusChanged(QMediaPlayer::MediaStatus)), &loop, SLOT (quit()));
qDebug() << "Starting waiting loop on media status" << d->m_player.mediaStatus(); //qDebug() << "Starting waiting loop on media status" << d->m_player.mediaStatus();
loop.exec(); loop.exec();
} qDebug() << "Changing position"; } //qDebug() << "Changing position";
if (startingPosition > 1000) d->m_player.setPosition(startingPosition); if (startingPosition > 1000) d->m_player.setPosition(startingPosition);
d->m_player.pause(); d->m_player.pause();
d->m_readyToPlay = true; d->m_readyToPlay = true;
@ -224,11 +224,11 @@ void AudioManager::setEntry(Entry* entry)
Q_EMIT canGoNextChanged(); Q_EMIT canGoNextChanged();
d->m_isSeekable = true; d->m_isSeekable = true;
Q_EMIT seekableChanged(true); Q_EMIT seekableChanged(true);
qDebug() << "Duration" << d->m_player.duration()/1000 << d->m_entry->enclosure()->duration(); //qDebug() << "Duration" << d->m_player.duration()/1000 << d->m_entry->enclosure()->duration();
// Finally, check if duration mentioned in enclosure corresponds to real duration // Finally, check if duration mentioned in enclosure corresponds to real duration
if ((d->m_player.duration()/1000) != d->m_entry->enclosure()->duration()) { if ((d->m_player.duration()/1000) != d->m_entry->enclosure()->duration()) {
d->m_entry->enclosure()->setDuration(d->m_player.duration()/1000); d->m_entry->enclosure()->setDuration(d->m_player.duration()/1000);
qDebug() << "Correcting duration of" << d->m_entry->id() << "to" << d->m_player.duration()/1000; //qDebug() << "Correcting duration of" << d->m_entry->id() << "to" << d->m_player.duration()/1000;
} }
} else { } else {
DataManager::instance().setLastPlayingEntry(QStringLiteral("none")); DataManager::instance().setLastPlayingEntry(QStringLiteral("none"));
@ -256,7 +256,7 @@ void AudioManager::setMuted(bool muted)
void AudioManager::setVolume(qreal volume) void AudioManager::setVolume(qreal volume)
{ {
qDebug() << "AudioManager::setVolume" << volume; //qDebug() << "AudioManager::setVolume" << volume;
auto realVolume = static_cast<qreal>(QAudio::convertVolume(volume / 100.0, QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale)); auto realVolume = static_cast<qreal>(QAudio::convertVolume(volume / 100.0, QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale));
d->m_player.setVolume(qRound(realVolume * 100)); d->m_player.setVolume(qRound(realVolume * 100));
@ -265,7 +265,7 @@ void AudioManager::setVolume(qreal volume)
/* /*
void AudioManager::setSource(const QUrl &source) void AudioManager::setSource(const QUrl &source)
{ {
qDebug() << "AudioManager::setSource" << source; //qDebug() << "AudioManager::setSource" << source;
d->m_player.setMedia({source}); d->m_player.setMedia({source});
} }
@ -273,21 +273,21 @@ void AudioManager::setSource(const QUrl &source)
void AudioManager::setPosition(qint64 position) void AudioManager::setPosition(qint64 position)
{ {
qDebug() << "AudioManager::setPosition" << position; //qDebug() << "AudioManager::setPosition" << position;
d->m_player.setPosition(position); d->m_player.setPosition(position);
} }
void AudioManager::setPlaybackRate(const qreal rate) void AudioManager::setPlaybackRate(const qreal rate)
{ {
qDebug() << "AudioManager::setPlaybackRate" << rate; //qDebug() << "AudioManager::setPlaybackRate" << rate;
d->m_player.setPlaybackRate(rate); d->m_player.setPlaybackRate(rate);
} }
void AudioManager::play() void AudioManager::play()
{ {
qDebug() << "AudioManager::play"; //qDebug() << "AudioManager::play";
d->m_player.play(); d->m_player.play();
d->m_isSeekable = true; d->m_isSeekable = true;
@ -296,7 +296,7 @@ void AudioManager::play()
void AudioManager::pause() void AudioManager::pause()
{ {
qDebug() << "AudioManager::pause"; //qDebug() << "AudioManager::pause";
d->m_player.play(); d->m_player.play();
d->m_isSeekable = true; d->m_isSeekable = true;
@ -313,7 +313,7 @@ void AudioManager::playPause()
void AudioManager::stop() void AudioManager::stop()
{ {
qDebug() << "AudioManager::stop"; //qDebug() << "AudioManager::stop";
d->m_player.stop(); d->m_player.stop();
d->m_isSeekable = false; d->m_isSeekable = false;
@ -322,20 +322,20 @@ void AudioManager::stop()
void AudioManager::seek(qint64 position) void AudioManager::seek(qint64 position)
{ {
qDebug() << "AudioManager::seek" << position; //qDebug() << "AudioManager::seek" << position;
d->m_player.setPosition(position); d->m_player.setPosition(position);
} }
void AudioManager::skipForward() void AudioManager::skipForward()
{ {
qDebug() << "AudioManager::skipForward"; //qDebug() << "AudioManager::skipForward";
seek(std::min((position() + SKIP_STEP), duration())); seek(std::min((position() + SKIP_STEP), duration()));
} }
void AudioManager::skipBackward() void AudioManager::skipBackward()
{ {
qDebug() << "AudioManager::skipBackward"; //qDebug() << "AudioManager::skipBackward";
seek(std::max((qint64)0, (position() - SKIP_STEP))); seek(std::max((qint64)0, (position() - SKIP_STEP)));
} }
@ -349,7 +349,7 @@ bool AudioManager::canGoNext() const
if (index < DataManager::instance().getQueue().count()-1) { if (index < DataManager::instance().getQueue().count()-1) {
Entry* next_entry = DataManager::instance().getEntry(DataManager::instance().getQueue()[index+1]); Entry* next_entry = DataManager::instance().getEntry(DataManager::instance().getQueue()[index+1]);
if (next_entry->enclosure()) { if (next_entry->enclosure()) {
qDebug() << "Enclosure status" << next_entry->enclosure()->path() << next_entry->enclosure()->status(); //qDebug() << "Enclosure status" << next_entry->enclosure()->path() << next_entry->enclosure()->status();
if (next_entry->enclosure()->status() == Enclosure::Downloaded) { if (next_entry->enclosure()->status() == Enclosure::Downloaded) {
return true; return true;
} }
@ -365,18 +365,18 @@ void AudioManager::next()
if (canGoNext()) { if (canGoNext()) {
QMediaPlayer::State previousTrackState = playbackState(); QMediaPlayer::State previousTrackState = playbackState();
int index = DataManager::instance().getQueue().indexOf(d->m_entry->id()); int index = DataManager::instance().getQueue().indexOf(d->m_entry->id());
qDebug() << "Skipping to" << DataManager::instance().getQueue()[index+1]; //qDebug() << "Skipping to" << DataManager::instance().getQueue()[index+1];
setEntry(DataManager::instance().getEntry(DataManager::instance().getQueue()[index+1])); setEntry(DataManager::instance().getEntry(DataManager::instance().getQueue()[index+1]));
if (previousTrackState == QMediaPlayer::PlayingState) play(); if (previousTrackState == QMediaPlayer::PlayingState) play();
} else { } else {
qDebug() << "Next track cannot be played, changing entry to nullptr"; //qDebug() << "Next track cannot be played, changing entry to nullptr";
setEntry(nullptr); setEntry(nullptr);
} }
} }
void AudioManager::mediaStatusChanged() void AudioManager::mediaStatusChanged()
{ {
qDebug() << "AudioManager::mediaStatusChanged" << d->m_player.mediaStatus(); //qDebug() << "AudioManager::mediaStatusChanged" << d->m_player.mediaStatus();
// File has reached the end and has stopped // File has reached the end and has stopped
if (d->m_player.mediaStatus() == QMediaPlayer::EndOfMedia) { if (d->m_player.mediaStatus() == QMediaPlayer::EndOfMedia) {
@ -386,7 +386,7 @@ void AudioManager::mediaStatusChanged()
void AudioManager::playerStateChanged() void AudioManager::playerStateChanged()
{ {
qDebug() << "AudioManager::playerStateChanged" << d->m_player.state(); //qDebug() << "AudioManager::playerStateChanged" << d->m_player.state();
switch(d->m_player.state()) switch(d->m_player.state())
{ {
@ -407,14 +407,14 @@ void AudioManager::playerStateChanged()
void AudioManager::playerVolumeChanged() void AudioManager::playerVolumeChanged()
{ {
qDebug() << "AudioManager::playerVolumeChanged" << d->m_player.volume(); //qDebug() << "AudioManager::playerVolumeChanged" << d->m_player.volume();
QTimer::singleShot(0, [this]() {Q_EMIT volumeChanged();}); QTimer::singleShot(0, [this]() {Q_EMIT volumeChanged();});
} }
void AudioManager::playerMutedChanged() void AudioManager::playerMutedChanged()
{ {
qDebug() << "AudioManager::playerMutedChanged"; //qDebug() << "AudioManager::playerMutedChanged";
QTimer::singleShot(0, [this]() {Q_EMIT mutedChanged(muted());}); QTimer::singleShot(0, [this]() {Q_EMIT mutedChanged(muted());});
} }
@ -428,5 +428,5 @@ void AudioManager::savePlayPosition(qint64 position)
} }
} }
} }
qDebug() << d->m_player.mediaStatus(); //qDebug() << d->m_player.mediaStatus();
} }