diff options
| author | Felix (xq) Queißner <git@mq32.de> | 2020-06-19 10:52:30 +0200 |
|---|---|---|
| committer | Felix (xq) Queißner <git@mq32.de> | 2020-06-19 10:52:30 +0200 |
| commit | 1eec0c9fa22e86225691e7892e9219e7d17d5c42 (patch) | |
| tree | 059c9cdd8339751f51793b8fd38a03f93ae28ae7 /src | |
| parent | 6a5198d23412a6d11f78cdef71850e578ca6f8c0 (diff) | |
| download | kristall-1eec0c9fa22e86225691e7892e9219e7d17d5c42.tar.gz | |
Fixed multimedia bug.
Diffstat (limited to 'src')
| -rw-r--r-- | src/browsertab.cpp | 3 | ||||
| -rw-r--r-- | src/mediaplayer.cpp | 5 | ||||
| -rw-r--r-- | src/mediaplayer.hpp | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/browsertab.cpp b/src/browsertab.cpp index 9b7f716..6e18e07 100644 --- a/src/browsertab.cpp +++ b/src/browsertab.cpp @@ -301,6 +301,8 @@ static QByteArray convertToUtf8(QByteArray const & input, QString const & charSe void BrowserTab::on_requestComplete(const QByteArray &ref_data, const QString &mime_text) { + this->ui->media_browser->stopPlaying(); + QByteArray data = ref_data; MimeType mime = MimeParser::parse(mime_text); @@ -632,7 +634,6 @@ void BrowserTab::on_text_browser_anchorClicked(const QUrl &url) if(response == QMessageBox::Yes) { this->startRequest(this->current_location, ProtocolHandler::IgnoreTlsErrors); } - } } else { QMessageBox::critical( diff --git a/src/mediaplayer.cpp b/src/mediaplayer.cpp index 809d24a..66a5455 100644 --- a/src/mediaplayer.cpp +++ b/src/mediaplayer.cpp @@ -52,6 +52,11 @@ void MediaPlayer::setMedia(QByteArray const & data, QUrl const & ref_url, QStrin this->player.setMedia(content, &this->media_stream); } +void MediaPlayer::stopPlaying() +{ + this->player.stop(); +} + void MediaPlayer::on_playpause_button_clicked() { if(this->player.state() != QMediaPlayer::PlayingState) { diff --git a/src/mediaplayer.hpp b/src/mediaplayer.hpp index a4440a6..406a0e0 100644 --- a/src/mediaplayer.hpp +++ b/src/mediaplayer.hpp @@ -20,6 +20,8 @@ public: void setMedia(QByteArray const & data, QUrl const & ref_url, QString const & mime); + void stopPlaying(); + private slots: void on_playpause_button_clicked(); |
