Added limit to the maximum speed at which it sends. No more opening t…

…he stream as download and getting 500MB in a few seconds.

PiStrom/Config/StreamInfo.cs

@@ -25,10 +25,15 @@ public class StreamInfo
         public string Genre { get; set; }
 
         /// <summary>
-        /// The Interval (in bytes) in which meta information about the stream is sent. Also the size of the byte buffer.
+        /// Gets or sets the interval (in bytes) in which meta information about the stream is sent. Also the size of the byte buffer.
         /// </summary>
         public int MetaInt { get; set; }
 
+        /// <summary>
+        /// Gets or sets the maximum rate at which data is sent. In bytes per second.
+        /// </summary>
+        public int TargetByteRate { get; set; }
+
         /// <summary>
         /// Gets or sets the Music that is played on the stream.
         /// </summary>

PiStrom/Config/StreamInfo.xsd

@@ -11,6 +11,7 @@
         <xs:element name="Name" type="xs:string" />
         <xs:element name="Genre" type="xs:string" />
         <xs:element name="MetaInt" type="xs:unsignedInt" />
+        <xs:element name="TargetByteRate" type="xs:unsignedInt" />
         <xs:element name="Music">
           <xs:complexType>
             <xs:sequence>

PiStrom/MusicStream.cs

@@ -30,6 +30,8 @@ public class MusicStream
 
         private Random random = new Random();
 
+        private int delay;
+
         public MusicStream(string configPath)
         {
             XmlReader reader = XmlReader.Create(configPath);
@@ -43,12 +45,14 @@ public MusicStream(string configPath)
 
             fileBuffer = new byte[StreamInfo.MetaInt];
 
+            delay = (int)(((double)StreamInfo.MetaInt / (double)StreamInfo.TargetByteRate) * 1000d);
+
             Running = false;
         }
 
         public void AddClient(Socket client, bool metaInfo)
         {
-            string responseHeader = "HTTP/1.1 200 OK\r\nContent-Type: application/octet-stream\r\nServer: PiStrøm\r\nCache-Control: no-cache\r\nPragma: no-cache\r\nConnection: close\r\n" + (metaInfo ? "icy-metaint:" + StreamInfo.MetaInt + "\r\nicy-name:" + StreamInfo.Name + "\r\nicy-genre:" + StreamInfo.Genre + "\r\n" : "") + "\r\n"; //icy-url:http://localhost:1337\r\n type: audio/mpeg
+            string responseHeader = "HTTP/1.1 200 OK\r\nContent-Type: audio/mpeg\r\nServer: PiStrøm\r\nCache-Control: no-cache\r\nPragma: no-cache\r\nConnection: close\r\n" + (metaInfo ? "icy-metaint:" + StreamInfo.MetaInt + "\r\nicy-name:" + StreamInfo.Name + "\r\nicy-genre:" + StreamInfo.Genre + "\r\n" : "") + "\r\n"; //icy-url:http://localhost:1337\r\n type: audio/mpeg
             client.Send(Encoding.UTF8.GetBytes(responseHeader));
             clients.Add(client, metaInfo);
         }
@@ -57,6 +61,8 @@ public void Run(CancellationToken cancellationToken)
         {
             Running = true;
 
+            DateTime lastSend = DateTime.Now.AddDays(-1);
+
             if (fileStream == null)
                 setNewSourceFile();
 
@@ -73,6 +79,13 @@ public void Run(CancellationToken cancellationToken)
 
                 List<Socket> remove = new List<Socket>();
 
+                int sinceLastSend = (int)(DateTime.Now - lastSend).TotalMilliseconds;
+                if (sinceLastSend < delay)
+                {
+                    Thread.Sleep(delay - sinceLastSend);
+                }
+                lastSend = DateTime.Now;
+
                 Parallel.ForEach(clients, client =>
                 {
                     try

PiStrom/Streams/Electro.xml

@@ -3,6 +3,7 @@
   <Name>Electro Stream</Name>
   <Genre>Electro</Genre>
   <MetaInt>32768</MetaInt>
+  <TargetByteRate>24000</TargetByteRate>
   <Music FileType="mp3">
     <TimeSpan From="02:00" Till="21:40">
       <Folder>C:\Users\Banane\Music\Binärpilot</Folder>

README.md

@@ -66,6 +66,7 @@ This folder contains the informations for the individual streams that will be av
   <Name>Electro Stream</Name>
   <Genre>Electro</Genre>
   <MetaInt>32768</MetaInt>
+  <TargetByteRate>24000</TargetByteRate>
   <Music FileType="mp3">
     <TimeSpan From="02:00" Till="21:40">
       <Folder>C:\Users\Banane\Music\Binärpilot</Folder>
@@ -86,6 +87,8 @@ While it is a bit more complex than `PiStrom.xml`, it's easy to understand as we
 
 * `<MetaInt>` is the interval (in bytes) at which MetaInfo will be embedded into the Stream. Also defines the size of the buffer into which is read from the file and from which is written into the Stream.
 
+* `<TargetByteRate>` is the maximum rate at which data is sent. In bytes per second. To get the value from the kbit/s of the music, multiply by 8000. For example 192kbit/s would require 24000 byte/s.
+
 Now, the values for Name and Genre only matter if the Client requests `Ice-MetaInt: 1` as a HTTP header in the request. The MetaInfo will also only be sent if that was requested, but it still defines the buffer size.
 
 On, to the `<Music>` tag: