diff options
| author | Lasse Räihä <lasse.raiha@digia.com> | 2014-09-09 09:02:29 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@digia.com> | 2014-09-10 08:56:54 +0300 |
| commit | 7d3c4caa1dc3784683dcbb298ad4d12324737334 (patch) | |
| tree | 59e84b818c4a7a502814cbb5b9414ee08c7ce96e /QtDemo | |
| parent | f267f01f7ae7ff104816ab62ecc138326e0b7d8a (diff) | |
Fixed crash-bug when exit radio. One radio channel replaced.
Change-Id: I573bd9922b9a3a287509278e95974c39546053ab
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Kimmo Ollila <kimmo.ollila@digia.com>
Diffstat (limited to 'QtDemo')
| -rw-r--r-- | QtDemo/qml/QtDemo/demos/radio/channels.xml | 2 | ||||
| -rw-r--r-- | QtDemo/qml/QtDemo/demos/radio/radio.qml | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/QtDemo/qml/QtDemo/demos/radio/channels.xml b/QtDemo/qml/QtDemo/demos/radio/channels.xml index 0ba2bb7..0dac5c9 100644 --- a/QtDemo/qml/QtDemo/demos/radio/channels.xml +++ b/QtDemo/qml/QtDemo/demos/radio/channels.xml @@ -18,6 +18,6 @@ </channel> <channel> <title>Radio Paradise</title> - <url>http://stream-tx1.radioparadise.com/mp3-128</url> + <url>http://scfire-m26.websys.aol.com:80/radio_paradise_mp3_128kbps.mp3</url> </channel> </radio> diff --git a/QtDemo/qml/QtDemo/demos/radio/radio.qml b/QtDemo/qml/QtDemo/demos/radio/radio.qml index 8dd0423..4099ad1 100644 --- a/QtDemo/qml/QtDemo/demos/radio/radio.qml +++ b/QtDemo/qml/QtDemo/demos/radio/radio.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtMultimedia 5.0 import QtQuick.XmlListModel 2.0 @@ -61,14 +61,7 @@ FocusScope { id: playMusic source: "" volume: volumeButton.volume - onSourceChanged: { - if (volumeButton.playing) playMusic.play() - } - onAvailabilityChanged: { - if (availability === Audio.Available) { - if (volumeButton.playing) playMusic.play() - } - } + autoLoad: true Component.onDestruction: { volumeButton.playing = false playMusic.stop() @@ -134,9 +127,19 @@ FocusScope { Timer { id: browseTimer - interval: 500 + interval: 1000 property string source:"" - onTriggered: playMusic.source = source + onTriggered: { + + if (playMusic.status===Audio.Loading) { + browseTimer.restart() + return; + } + playMusic.stop() + playMusic.source = "" + playMusic.source = source + + } } path: Path { |