diff --git a/README.md b/README.md index c45fb92..29e5146 100644 --- a/README.md +++ b/README.md @@ -46,12 +46,12 @@ __SuomiRock__ - AAC : http://stream.bauermedia.fi/suomirock/suomirock_64.aac - MP3 : http://stream.bauermedia.fi/suomirock/suomirock_128.mp3 -__YLE X__ -- AAC/HLS : http://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8 - __YLE Satakunnan Radio__ - AAC/HLS : http://yleuni-f.akamaihd.net/i/yleliveradiohd_23@113900/master.m3u8 +__YLE X__ +- AAC/HLS : http://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8 + __Ysäri__ - AAC: https://stream.bauermedia.fi/ysari/ysari_64.aac diff --git a/playlist.json b/playlist.json index 2ad2e07..9e7e0d2 100644 --- a/playlist.json +++ b/playlist.json @@ -116,15 +116,6 @@ } }, - { - "name": "YLE X", - "owner": "Yleisradio", - "stream": { - "default": "m3u8", - "m3u8": "http://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8" - } - }, - { "name": "YLE Satakunnan Radio", "owner": "Yleisradio", @@ -134,6 +125,15 @@ } }, + { + "name": "YLE X", + "owner": "Yleisradio", + "stream": { + "default": "m3u8", + "m3u8": "http://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8" + } + }, + { "name": "Ysäri", "owner": "Mediatakojat", diff --git a/playlist.m3u b/playlist.m3u index 8468cc7..0b073bd 100644 --- a/playlist.m3u +++ b/playlist.m3u @@ -38,11 +38,11 @@ https://digitacdn.akamaized.net/hls/live/629243/radiosuomipop/master-128000.m3u8 #EXTINF:-1,SuomiRock http://stream.bauermedia.fi/suomirock/suomirock_64.aac -#EXTINF:-1,YLE X -AAC (64kbps): http://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8 - #EXTINF:-1,YLE Satakunnan Radio http://yleuni-f.akamaihd.net/i/yleliveradiohd_23@113900/master.m3u8 +#EXTINF:-1,YLE X +AAC (64kbps): http://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8 + #EXTINF:-1, Ysäri https://stream.bauermedia.fi/ysari/ysari_64.aac \ No newline at end of file diff --git a/playlist.pls b/playlist.pls index a31c991..d2ba36f 100644 --- a/playlist.pls +++ b/playlist.pls @@ -38,11 +38,11 @@ Title12=Radio Suomipop File13=http://stream.bauermedia.fi/suomirock/suomirock_64.aac Title13=SuomiRock -File14=http://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8 -Title14=YLE X +File14=http://yleuni-f.akamaihd.net/i/yleliveradiohd_23@113900/master.m3u8 +Title14=YLE Satakunnan Radio -File15=http://yleuni-f.akamaihd.net/i/yleliveradiohd_23@113900/master.m3u8 -Title15=YLE Satakunnan Radio +File15=http://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8 +Title15=YLE X File16=https://stream.bauermedia.fi/ysari/ysari_64.aac Title16=Ysäri diff --git a/playlist.xspf b/playlist.xspf index 2328f04..37b667b 100644 --- a/playlist.xspf +++ b/playlist.xspf @@ -53,14 +53,14 @@ SuomiRock http://stream.bauermedia.fi/suomirock/suomirock_64.aac - - YLE X - http://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8 - YLE Satakunnan Radio http://yleuni-f.akamaihd.net/i/yleliveradiohd_23@113900/master.m3u8 + + YLE X + http://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8 + Ysäri https://stream.bauermedia.fi/ysari/ysari_64.aac