thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix palette access and QMediaPlayer errors

Browse source
This commit is contained in:
Nicolas Werner 2023-06-02 01:29:05 +02:00
parent e85a1d4aeb
commit 54e2295c21
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
88 changed files with 426 additions and 480 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/timeline/InputBar.cpp
View file

@ -1033,12 +1033,12 @@ MediaUpload::MediaUpload(std::unique_ptr<QIODevice> source_,
}
connect(mediaPlayer,
&QMediaPlayer::error,
&QMediaPlayer::errorOccurred,
this,
[mediaPlayer]() {
[](QMediaPlayer::Error error, QString errorString) {
nhlog::ui()->debug("Media player error {} and errorStr {}",
mediaPlayer->error(),
mediaPlayer->errorString().toStdString());
error,
errorString.toStdString());
});
connect(mediaPlayer,
&QMediaPlayer::mediaStatusChanged,

15
src/ui/MxcMediaProxy.cpp
View file

@ -25,13 +25,14 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent)
{
connect(this, &MxcMediaProxy::eventIdChanged, &MxcMediaProxy::startDownload);
connect(this, &MxcMediaProxy::roomChanged, &MxcMediaProxy::startDownload);
connect(this,
&MxcMediaProxy::error,
[this]() {
nhlog::ui()->info("Media player error {} and errorStr {}",
error(),
this->errorString().toStdString());
});
connect(this,
&QMediaPlayer::errorOccurred,
this,
[](QMediaPlayer::Error error, QString errorString) {
nhlog::ui()->debug("Media player error {} and errorStr {}",
error,
errorString.toStdString());
});
connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) {
nhlog::ui()->info("Media player status {} and error {}", status, this->error());
});

8
src/voip/CallManager.cpp
View file

@ -173,11 +173,11 @@ CallManager::CallManager(QObject *parent)
});
connect(&player_,
&QMediaPlayer::error,
&QMediaPlayer::errorOccurred,
this,
[this]() {
[this](QMediaPlayer::Error error, QString errorString) {
stopRingtone();
switch (player_.error()) {
switch (error) {
case QMediaPlayer::FormatError:
case QMediaPlayer::ResourceError:
nhlog::ui()->error("WebRTC: valid ringtone file not found");
@ -186,7 +186,7 @@ CallManager::CallManager(QObject *parent)
nhlog::ui()->error("WebRTC: access to ringtone file denied");
break;
default:
nhlog::ui()->error("WebRTC: unable to play ringtone");
nhlog::ui()->error("WebRTC: unable to play ringtone, {}", errorString.toStdString());
break;
}
});