From 6b235022a7bf6f83213b65602f789b1875c4f39a Mon Sep 17 00:00:00 2001
From: Roy Olav Purser <admin@royolav.net>
Date: Sat, 27 Mar 2021 16:19:01 +0100
Subject: [PATCH] Revert "Revert "add ostlandssendingen""

This reverts commit 96e08149353b9a74d13e2029c0ad544474b7a871.
---
 icecast.xml  | 75 ++++++++++++++++++++++++++++++----------------------
 playlist.m3u | 32 +++++++++++-----------
 2 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/icecast.xml b/icecast.xml
index fc7d34a..8354232 100644
--- a/icecast.xml
+++ b/icecast.xml
@@ -18,7 +18,7 @@
     <relay>
         <server>lyd.nrk.no</server>
         <port>80</port>
-        <mount>/nrk_radio_p1_innlandet_mp3_h?_hdr=0</mount>
+        <mount>/nrk_radio_p1_innlandet_mp3_h</mount>
         <local-mount>/ch-200</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
@@ -26,7 +26,7 @@
     <relay>
         <server>lyd.nrk.no</server>
         <port>80</port>
-        <mount>/nrk_radio_p2_mp3_h?_hdr=0</mount>
+        <mount>/nrk_radio_p1_ostlandssendingen_mp3_h</mount>
         <local-mount>/ch-201</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
@@ -34,7 +34,7 @@
     <relay>
         <server>lyd.nrk.no</server>
         <port>80</port>
-        <mount>/nrk_radio_p3_mp3_h?_hdr=0</mount>
+        <mount>/nrk_radio_p2_mp3_h</mount>
         <local-mount>/ch-202</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
@@ -42,7 +42,7 @@
     <relay>
         <server>lyd.nrk.no</server>
         <port>80</port>
-        <mount>/nrk_radio_mp3_mp3_h?_hdr=0</mount>
+        <mount>/nrk_radio_p3_mp3_h</mount>
         <local-mount>/ch-203</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
@@ -50,15 +50,15 @@
     <relay>
         <server>lyd.nrk.no</server>
         <port>80</port>
-        <mount>/nrk_radio_p13_mp3_h?_hdr=0</mount>
+        <mount>/nrk_radio_mp3_mp3_h</mount>
         <local-mount>/ch-204</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
     <relay>
-        <server>p4.p4groupaudio.com</server>
+        <server>lyd.nrk.no</server>
         <port>80</port>
-        <mount>/P04_MM</mount>
+        <mount>/nrk_radio_p13_mp3_h</mount>
         <local-mount>/ch-205</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
@@ -66,16 +66,24 @@
     <relay>
         <server>p4.p4groupaudio.com</server>
         <port>80</port>
-        <mount>/P05_MM</mount>
+        <mount>/P04_MM</mount>
         <local-mount>/ch-206</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
+    <relay>
+        <server>p4.p4groupaudio.com</server>
+        <port>80</port>
+        <mount>/P05_MM</mount>
+        <local-mount>/ch-207</local-mount>
+        <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
+        <on-demand>0</on-demand>
+    </relay>
     <relay>
         <server>p6.p4groupaudio.com</server>
         <port>80</port>
         <mount>/P06_MM</mount>
-        <local-mount>/ch-207</local-mount>
+        <local-mount>/ch-208</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
@@ -83,7 +91,7 @@
         <server>p7.p4groupaudio.com</server>
         <port>80</port>
         <mount>/P07_MM</mount>
-        <local-mount>/ch-208</local-mount>
+        <local-mount>/ch-209</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
@@ -91,7 +99,7 @@
         <server>p8.p4groupaudio.com</server>
         <port>80</port>
         <mount>/P08_MM</mount>
-        <local-mount>/ch-209</local-mount>
+        <local-mount>/ch-210</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
@@ -99,7 +107,7 @@
         <server>p9.p4groupaudio.com</server>
         <port>80</port>
         <mount>/P09_MM</mount>
-        <local-mount>/ch-210</local-mount>
+        <local-mount>/ch-211</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
@@ -107,7 +115,7 @@
         <server>stream.radiometro.no</server>
         <port>80</port>
         <mount>/metro128.mp3</mount>
-        <local-mount>/ch-211</local-mount>
+        <local-mount>/ch-212</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
@@ -115,7 +123,7 @@
         <server>live-bauerno.sharp-stream.com</server>
         <port>80</port>
         <mount>/radionorge_no_vip</mount>
-        <local-mount>/ch-212</local-mount>
+        <local-mount>/ch-213</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
@@ -123,7 +131,7 @@
         <server>stream.radionova.no</server>
         <port>80</port>
         <mount>/mp3</mount>
-        <local-mount>/ch-213</local-mount>
+        <local-mount>/ch-214</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
@@ -131,7 +139,7 @@
         <server>stream.radiorandsfjord.no</server>
         <port>80</port>
         <mount>/randsfjord128.mp3</mount>
-        <local-mount>/ch-214</local-mount>
+        <local-mount>/ch-215</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
@@ -139,7 +147,7 @@
         <server>live-bauerno.sharp-stream.com</server>
         <port>80</port>
         <mount>/radiorock_no_vip</mount>
-        <local-mount>/ch-215</local-mount>
+        <local-mount>/ch-216</local-mount>
         <relay-shoutcast-metadata>1</relay-shoutcast-metadata>
         <on-demand>0</on-demand>
     </relay>
@@ -151,76 +159,81 @@
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-201</mount-name>
-        <stream-name>NRK P2</stream-name>
+        <stream-name>NRK P1 Østlandssendingen</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-202</mount-name>
-        <stream-name>NRK P3</stream-name>
+        <stream-name>NRK P2</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-203</mount-name>
-        <stream-name>NRK mP3</stream-name>
+        <stream-name>NRK P3</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-204</mount-name>
-        <stream-name>NRK P13</stream-name>
+        <stream-name>NRK mP3</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-205</mount-name>
-        <stream-name>P4 Lyden av Norge</stream-name>
+        <stream-name>NRK P13</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-206</mount-name>
-        <stream-name>P5 Hits</stream-name>
+        <stream-name>P4 Lyden av Norge</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-207</mount-name>
-        <stream-name>P6 Rock</stream-name>
+        <stream-name>P5 Hits</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-208</mount-name>
-        <stream-name>P7 Klem</stream-name>
+        <stream-name>P6 Rock</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-209</mount-name>
-        <stream-name>P8 Pop</stream-name>
+        <stream-name>P7 Klem</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-210</mount-name>
-        <stream-name>P9 Retro</stream-name>
+        <stream-name>P8 Pop</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-211</mount-name>
-        <stream-name>Radio Metro</stream-name>
+        <stream-name>P9 Retro</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-212</mount-name>
-        <stream-name>Radio Norge</stream-name>
+        <stream-name>Radio Metro</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-213</mount-name>
-        <stream-name>Radio Nova</stream-name>
+        <stream-name>Radio Norge</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-214</mount-name>
-        <stream-name>Radio Randsfjord</stream-name>
+        <stream-name>Radio Nova</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
         <mount-name>/ch-215</mount-name>
+        <stream-name>Radio Randsfjord</stream-name>
+    </mount>
+    <mount type="normal">
+        <charset>UTF-8</charset>
+        <mount-name>/ch-216</mount-name>
         <stream-name>Radio Rock</stream-name>
     </mount>
     <mount type="normal">
diff --git a/playlist.m3u b/playlist.m3u
index 3f463bd..87a4403 100644
--- a/playlist.m3u
+++ b/playlist.m3u
@@ -1,36 +1,38 @@
 #EXTM3U
 #EXTINF:0 radio="true", NRK P1 Innlandet
 https://icecast.purser.it:7000/ch-200
+#EXTINF:0 radio="true", NRK P1 Østlandssendingen
+https://icecast.purser.it:7000/ch-200
 #EXTINF:0 radio="true", NRK P2
-https://icecast.purser.it:7000/ch-201
-#EXTINF:0 radio="true", NRK P3
 https://icecast.purser.it:7000/ch-202
-#EXTINF:0 radio="true", NRK mP3
+#EXTINF:0 radio="true", NRK P3
 https://icecast.purser.it:7000/ch-203
-#EXTINF:0 radio="true", NRK P13
+#EXTINF:0 radio="true", NRK mP3
 https://icecast.purser.it:7000/ch-204
-#EXTINF:0 radio="true", P4 Lyden av Norge
+#EXTINF:0 radio="true", NRK P13
 https://icecast.purser.it:7000/ch-205
-#EXTINF:0 radio="true", P5 Hits
+#EXTINF:0 radio="true", P4 Lyden av Norge
 https://icecast.purser.it:7000/ch-206
-#EXTINF:0 radio="true", P6 Rock
+#EXTINF:0 radio="true", P5 Hits
 https://icecast.purser.it:7000/ch-207
-#EXTINF:0 radio="true", P7 Klem
+#EXTINF:0 radio="true", P6 Rock
 https://icecast.purser.it:7000/ch-208
-#EXTINF:0 radio="true", P8 Pop
+#EXTINF:0 radio="true", P7 Klem
 https://icecast.purser.it:7000/ch-209
-#EXTINF:0 radio="true", P9 Retro
+#EXTINF:0 radio="true", P8 Pop
 https://icecast.purser.it:7000/ch-210
-#EXTINF:0 radio="true", Radio Metro
+#EXTINF:0 radio="true", P9 Retro
 https://icecast.purser.it:7000/ch-211
-#EXTINF:0 radio="true", Radio Norge
+#EXTINF:0 radio="true", Radio Metro
 https://icecast.purser.it:7000/ch-212
-#EXTINF:0 radio="true", Radio Nova
+#EXTINF:0 radio="true", Radio Norge
 https://icecast.purser.it:7000/ch-213
-#EXTINF:0 radio="true", Radio Randsfjord
+#EXTINF:0 radio="true", Radio Nova
 https://icecast.purser.it:7000/ch-214
-#EXTINF:0 radio="true", Radio Rock
+#EXTINF:0 radio="true", Radio Randsfjord
 https://icecast.purser.it:7000/ch-215
+#EXTINF:0 radio="true", Radio Rock
+https://icecast.purser.it:7000/ch-216
 #EXTINF:0 radio="false", NRK 1
 https://nrk-live-no.telenorcdn.net/21/1/hls/nrk_1/playlist.m3u8
 #EXTINF:0 radio="false", NRK 2