nesnomis/harbour-allradio
1
0
Fork 0
Code Actions Packages Projects Releases Wiki Activity

Found the bloody aarch64 bug!!!! Should be fixed?!

Browse Source
This commit is contained in:
Niels 2025-06-07 18:07:47 +02:00
parent 0ef6d8895f
commit 30b3eb16c0
4 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
qml/items/RadioPlayer.qml
View File

@ -11,7 +11,7 @@ MediaPlayer {
property string _stationuuid: "" property string _stationuuid: ""
property string _name: "" property string _name: ""
property string _favicon: "" property string _favicon: ""
property string _countrycode: "" property string _cc: ""
property string _tags: "" property string _tags: ""
property string _codec: "" property string _codec: ""
property string _bitrate: "" property string _bitrate: ""
@ -55,7 +55,10 @@ MediaPlayer {
onPlaying: if (!playerPageOpen) pageStack.push("../pages/RadioPlayerPage.qml") onPlaying: if (!playerPageOpen) pageStack.push("../pages/RadioPlayerPage.qml")
on_CcChanged: console.log(_cc)
onMetaInfoChanged: { onMetaInfoChanged: {
console.log( " *** MetaInfo")
if (metaInfo.search(" - ") > -1) { if (metaInfo.search(" - ") > -1) {
var res = metaInfo.split(" - ") var res = metaInfo.split(" - ")
radioArtist = res[0] radioArtist = res[0]
@ -67,6 +70,7 @@ MediaPlayer {
} }
onStationOkChanged: { onStationOkChanged: {
console.log(" *** StationOk "+stationOk)
if (stationOk === 1) { if (stationOk === 1) {
setStationClick() setStationClick()
getStationFavorite(_stationuuid) getStationFavorite(_stationuuid)
@ -78,7 +82,8 @@ MediaPlayer {
} }
on_StationuuidChanged: { on_StationuuidChanged: {
radioCountryName = radioBrowser.getCountryName(_countrycode) console.log(" *** StationuuidChanged: "+_cc)
radioCountryName = radioBrowser.getCountryName(_cc)
stop() stop()
source = "" source = ""
radioVideo = false radioVideo = false
@ -186,7 +191,7 @@ MediaPlayer {
_stationuuid = "" _stationuuid = ""
_name = "" _name = ""
_favicon = "" _favicon = ""
_countrycode = "" _cc = ""
_tags = "" _tags = ""
_codec = "" _codec = ""
_bitrate = "" _bitrate = ""
@ -238,7 +243,7 @@ MediaPlayer {
function setStationClick() { function setStationClick() {
Favorites.setStationClicked(JsFunctions.getTimeStamp(),_stationuuid,_name,_countrycode,_homepage,_url_resolved,_favicon,_tags,_codec,_bitrate,_hls,_favorite) Favorites.setStationClicked(JsFunctions.getTimeStamp(),_stationuuid,_name,_cc,_homepage,_url_resolved,_favicon,_tags,_codec,_bitrate,_hls,_favorite)
} }
function setStationFavorite(stationuuid,name,countrycode,homepage,url_resolved,favicon,tags,codec,bitrate,hls,favorite) { function setStationFavorite(stationuuid,name,countrycode,homepage,url_resolved,favicon,tags,codec,bitrate,hls,favorite) {
@ -262,7 +267,7 @@ MediaPlayer {
if (playlist.get(playlistIndex).url_resolved) { if (playlist.get(playlistIndex).url_resolved) {
_favicon = playlist.get(playlistIndex).favicon _favicon = playlist.get(playlistIndex).favicon
_name = playlist.get(playlistIndex).name _name = playlist.get(playlistIndex).name
_countrycode = playlist.get(playlistIndex).countrycode _cc = playlist.get(playlistIndex).countrycode
_tags = playlist.get(playlistIndex).tags _tags = playlist.get(playlistIndex).tags
_codec = playlist.get(playlistIndex).codec//getCodec(model.codec) _codec = playlist.get(playlistIndex).codec//getCodec(model.codec)
_bitrate = playlist.get(playlistIndex).bitrate //getBitrate(model.bitrate) _bitrate = playlist.get(playlistIndex).bitrate //getBitrate(model.bitrate)
@ -280,23 +285,25 @@ MediaPlayer {
} }
function loadRecentPlay(){ function loadRecentPlay(){
if (playHistory.get(0).url_resolved) { if (playHistory.count > 0) {
_favicon = playHistory.get(0).favicon if (playHistory.get(0).url_resolved) {
_name = playHistory.get(0).name _favicon = playHistory.get(0).favicon
_countrycode = playHistory.get(0).countrycode _name = playHistory.get(0).name
_tags = playHistory.get(0).tags _cc = playHistory.get(0).countrycode
_codec = playHistory.get(0).codec//getCodec(model.codec) _tags = playHistory.get(0).tags
_bitrate = playHistory.get(0).bitrate //getBitrate(model.bitrate) _codec = playHistory.get(0).codec//getCodec(model.codec)
_hls = playHistory.get(0).hls _bitrate = playHistory.get(0).bitrate //getBitrate(model.bitrate)
_url_resolved = playHistory.get(0).url_resolved _hls = playHistory.get(0).hls
_homepage = playHistory.get(0).homepage _url_resolved = playHistory.get(0).url_resolved
_stationuuid = playHistory.get(0).stationuuid _homepage = playHistory.get(0).homepage
_favorite = playHistory.get(0).favorite _stationuuid = playHistory.get(0).stationuuid
isPlaying = false _favorite = playHistory.get(0).favorite
isPaused = true isPlaying = false
///if (_favorite) playlistCount = Favorites.getSetting("playlistIndex",-1) isPaused = true
//playlistIndex = allradioSettings.value("currentFavorite",-1) ///if (_favorite) playlistCount = Favorites.getSetting("playlistIndex",-1)
// pageStack.push("RadioPlayerPage.qml") //playlistIndex = allradioSettings.value("currentFavorite",-1)
// pageStack.push("RadioPlayerPage.qml")
}
} }
} }
@ -305,7 +312,7 @@ MediaPlayer {
if (playlist.get(rnd).url_resolved) { if (playlist.get(rnd).url_resolved) {
_favicon = playlist.get(rnd).favicon _favicon = playlist.get(rnd).favicon
_name = playlist.get(rnd).name _name = playlist.get(rnd).name
_countrycode = playlist.get(rnd).countrycode _cc = playlist.get(rnd).countrycode
_tags = playlist.get(rnd).tags _tags = playlist.get(rnd).tags
_codec = playlist.get(rnd).codec//getCodec(model.codec) _codec = playlist.get(rnd).codec//getCodec(model.codec)
_bitrate = playlist.get(rnd).bitrate //getBitrate(model.bitrate) _bitrate = playlist.get(rnd).bitrate //getBitrate(model.bitrate)

10
qml/pages/AllRadio.qml
View File

@ -183,7 +183,7 @@ Page {
onClicked: { onClicked: {
if (model.url_resolved !== radioPlayer._url_resolved) { if (model.url_resolved !== radioPlayer._url_resolved) {
radioPlayer._countrycode = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!? radioPlayer._cc = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!?
radioPlayer._favicon = model.favicon radioPlayer._favicon = model.favicon
radioPlayer._name = model.name radioPlayer._name = model.name
radioPlayer._tags = model.tags radioPlayer._tags = model.tags
@ -226,7 +226,7 @@ Page {
flagVisible: true flagVisible: true
onClicked: { onClicked: {
if (model.url_resolved !== radioPlayer._url_resolved) { if (model.url_resolved !== radioPlayer._url_resolved) {
radioPlayer._countrycode = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!? radioPlayer._cc = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!?
radioPlayer._favicon = model.favicon radioPlayer._favicon = model.favicon
radioPlayer._name = model.name radioPlayer._name = model.name
radioPlayer._tags = model.tags radioPlayer._tags = model.tags
@ -292,7 +292,7 @@ Page {
flagVisible: false flagVisible: false
onClicked: { onClicked: {
if (model.url_resolved !== radioPlayer._url_resolved) { if (model.url_resolved !== radioPlayer._url_resolved) {
radioPlayer._countrycode = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!? radioPlayer._cc = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!?
radioPlayer._favicon = model.favicon radioPlayer._favicon = model.favicon
radioPlayer._name = model.name radioPlayer._name = model.name
radioPlayer._tags = model.tags radioPlayer._tags = model.tags
@ -333,7 +333,7 @@ Page {
flagVisible: false flagVisible: false
onClicked: { onClicked: {
if (model.url_resolved !== radioPlayer._url_resolved) { if (model.url_resolved !== radioPlayer._url_resolved) {
radioPlayer._countrycode = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!? radioPlayer._cc = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!?
radioPlayer._favicon = model.favicon radioPlayer._favicon = model.favicon
radioPlayer._name = model.name radioPlayer._name = model.name
radioPlayer._tags = model.tags radioPlayer._tags = model.tags
@ -370,7 +370,7 @@ Page {
flagVisible: true flagVisible: true
onClicked: { onClicked: {
if (model.url_resolved !== radioPlayer._url_resolved) { if (model.url_resolved !== radioPlayer._url_resolved) {
radioPlayer._countrycode = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!? radioPlayer._cc = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!?
radioPlayer._favicon = model.favicon radioPlayer._favicon = model.favicon
radioPlayer._name = model.name radioPlayer._name = model.name
radioPlayer._tags = model.tags radioPlayer._tags = model.tags

4
qml/pages/CountryStationsPage.qml
View File

@ -190,9 +190,9 @@ Page {
delegate: StationsDelegate{ delegate: StationsDelegate{
onClicked: { onClicked: {
if (model.url_resolved !== radioPlayer._url_resolved) { if (model.url_resolved !== radioPlayer._url_resolved) {
radioPlayer._favicon = model.favicon radioPlayer._cc = model.countrycode
radioPlayer._name = model.name radioPlayer._name = model.name
radioPlayer._countrycode = model.countrycode radioPlayer._favicon = model.favicon
radioPlayer._tags = model.tags radioPlayer._tags = model.tags
radioPlayer._codec = model.codec radioPlayer._codec = model.codec
radioPlayer._bitrate = model.bitrate radioPlayer._bitrate = model.bitrate

4
qml/pages/RadioPlayerPage.qml
View File

@ -63,7 +63,7 @@ Page {
height: countryName.height * 0.9 height: countryName.height * 0.9
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
smooth: false smooth: false
source: radioPlayer._countrycode === "" ? "../images/bycountry_t.png" : "../flags/"+radioPlayer._countrycode.toLowerCase()+".png" source: radioPlayer._cc === "" ? "../images/bycountry_t.png" : "../flags/"+radioPlayer._cc.toLowerCase()+".png"
} }
} }
Label { Label {
@ -282,7 +282,7 @@ Page {
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
radioPlayer._favorite ? radioPlayer._favorite = false : radioPlayer._favorite = true radioPlayer._favorite ? radioPlayer._favorite = false : radioPlayer._favorite = true
radioPlayer.setStationFavorite(radioPlayer._stationuuid,radioPlayer._name,radioPlayer._countrycode,radioPlayer._homepage,radioPlayer._url_resolved,radioPlayer._favicon,radioPlayer._tags,radioPlayer._codec,radioPlayer._bitrate,radioPlayer._hls,radioPlayer._favorite) radioPlayer.setStationFavorite(radioPlayer._stationuuid,radioPlayer._name,radioPlayer._cc,radioPlayer._homepage,radioPlayer._url_resolved,radioPlayer._favicon,radioPlayer._tags,radioPlayer._codec,radioPlayer._bitrate,radioPlayer._hls,radioPlayer._favorite)
} }
} }
} }