v.1.3.11.2, 2014-12-08, 15:31:02

= Cooldown on reconnecting after connection drops
~ Remember if socket fallback for tags is in use

Loopstream/LSEncoder.cs

@@ -8,6 +8,11 @@
 
 namespace Loopstream
 {
+    public class LSFrame
+    {
+
+    }
+
     public class LSEncoder
     {
         object locker;
@@ -26,6 +31,9 @@ public class LSEncoder
         public bool crashed { get; private set; }
         public bool aborted { get; private set; }
 
+        public int iFrame;
+        public LSFrame[] frames;
+
         System.Net.Sockets.TcpClient tc;
         System.Net.Sockets.NetworkStream s;
 

Loopstream/LSPcmFeed.cs

@@ -7,6 +7,7 @@ namespace Loopstream
 {
     public class LSPcmFeed
     {
+        int res_cd;
         int quitting;
         object locker;
         bool shuttingDown;
@@ -20,6 +21,7 @@ public LSPcmFeed(LSSettings settings, NPatch.Fork.Outlet outlet)
             locker = new object();
             shuttingDown = false;
             quitting = 0;
+            res_cd = 0;
             makeSilenceFill();
             this.outlet = outlet;
             this.settings = settings;
@@ -166,6 +168,10 @@ void medic()
                     LSEncoder enc = encoders[a];
                     if (enc.crashed)
                     {
+                        if (res_cd == 0) Logger.pcm.a("pending resurrect " + enc.enc.ext);
+                        if (++res_cd < 50) continue;
+                        res_cd = 0;
+
                         Logger.pcm.a("resurrecting " + enc.enc.ext);
                         enc.Dispose();
                         try

Loopstream/LSSettings.cs

@@ -525,6 +525,7 @@ public enum LSRelay { ice, shout, siren }
         public string host, user, pass, mount;
         public string title, description, genre, url;
         public bool pubstream;
+        public bool tagsock;
 
         public bool testDevs;
         public bool splash;

Loopstream/LSTag.cs

@@ -349,7 +349,7 @@ void sendTags(Est est)
                 meta = Chencode.HonkHonk(meta);
                 //meta = est.tag;
             }
-            if (!socket_fallback)
+            if (!socket_fallback && !settings.tagsock)
             {
                 try
                 {
@@ -389,7 +389,7 @@ void sendTags(Est est)
                     //tag = new LSTD(false, "Meta-fail " + est.enc.ext, "(unknown error)");
                 }
             }
-            if (socket_fallback)
+            if (socket_fallback || settings.tagsock)
             {
                 try
                 {

Loopstream/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.11.1")]
-[assembly: AssemblyFileVersion("1.3.11.1")]
+[assembly: AssemblyVersion("1.3.11.2")]
+[assembly: AssemblyFileVersion("1.3.11.2")]

LoopstreamTraktor/tools/ice/readme.txt

@@ -0,0 +1,63 @@
+This folder should contain a portable icecast installation,
+make it match the recursive directory listing below.
+
+Also make sure to rename the icecast exe to
+traktor2loopstream.exe
+
+
+
+.:
+total 3896
+drwx------ 1 ed ed     288 Oct 11 15:23 .
+drwx------ 1 ed ed       6 Jan  4  2014 ..
+drwx------ 1 ed ed     210 Jan  4  2014 admin
+-rw-r--r-- 1 ed ed    1103 Jan  4  2014 icecast.xml
+-rw-r--r-- 1 ed ed  892928 Nov 28  2004 iconv.dll
+-rw-r--r-- 1 ed ed  176128 Feb 26  2006 libcurl.dll
+-rw-r--r-- 1 ed ed 1069056 May 10  2006 libeay32.dll
+-rw-r--r-- 1 ed ed  930816 Feb  8  2008 libxml2.dll
+-rw-r--r-- 1 ed ed  161792 Feb  8  2008 libxslt.dll
+drwx------ 1 ed ed      38 Jan  4  2014 logs
+-rw-r--r-- 1 ed ed   53300 Jun 22  2004 pthreadVSE.dll
+-rw-r--r-- 1 ed ed       0 Oct 11 15:23 README.txt
+-rw-r--r-- 1 ed ed  200704 May 10  2006 ssleay32.dll
+-rw-r--r-- 1 ed ed  417792 May 24  2008 traktor2loopstream.exe
+drwx------ 1 ed ed     350 Jan  4  2014 web
+-rw-r--r-- 1 ed ed   73728 Feb 26  2006 zlib1.dll
+
+./admin:
+total 36
+drwx------ 1 ed ed  210 Jan  4  2014 .
+drwx------ 1 ed ed  288 Oct 11 15:23 ..
+-rw-r--r-- 1 ed ed 3792 Apr 30  2008 listclients.xsl
+-rw-r--r-- 1 ed ed 3181 Apr 30  2008 listmounts.xsl
+-rw-r--r-- 1 ed ed 3430 Apr  7  2008 manageauth.xsl
+-rw-r--r-- 1 ed ed 2359 Apr  7  2008 moveclients.xsl
+-rw-r--r-- 1 ed ed 1956 Aug 11  2007 response.xsl
+-rw-r--r-- 1 ed ed 4276 Apr 30  2008 stats.xsl
+-rw-r--r-- 1 ed ed 2318 Apr  7  2008 updatemetadata.xsl
+-rw-r--r-- 1 ed ed 2944 Aug 11  2007 xspf.xsl
+
+./logs:
+total 4
+drwx------ 1 ed ed  38 Jan  4  2014 .
+drwx------ 1 ed ed 288 Oct 11 15:23 ..
+-rw-r--r-- 1 ed ed  29 Jan  4  2014 not an empty folder
+
+./web:
+total 80
+drwx------ 1 ed ed  350 Jan  4  2014 .
+drwx------ 1 ed ed  288 Oct 11 15:23 ..
+-rw-r--r-- 1 ed ed 1975 Apr  9  2008 auth.xsl
+-rw-r--r-- 1 ed ed 8164 Jul  4  2005 corner_bottomleft.jpg
+-rw-r--r-- 1 ed ed 8155 Jul  4  2005 corner_bottomright.jpg
+-rw-r--r-- 1 ed ed 8149 Jul  4  2005 corner_topleft.jpg
+-rw-r--r-- 1 ed ed 8151 Jul  4  2005 corner_topright.jpg
+-rw-r--r-- 1 ed ed 1104 Mar 21  2006 example.xsl
+-rw-r--r-- 1 ed ed 5073 Jul  4  2005 icecast.png
+-rw-r--r-- 1 ed ed 2228 Aug 12  2005 key.png
+-rw-r--r-- 1 ed ed 3053 Apr 30  2008 server_version.xsl
+-rw-r--r-- 1 ed ed  493 Jan  4  2014 status2.xsl
+-rw-r--r-- 1 ed ed 4748 Apr 30  2008 status.xsl
+-rw-r--r-- 1 ed ed 4972 May  9  2008 style.css
+-rw-r--r-- 1 ed ed 2042 Aug 12  2005 tunein.png

changelog.txt

@@ -3,6 +3,10 @@
 + new feature
 ~ other change
 
+2014-12-08, 15:31:02 - Loopstream 1.3.11.2
+  = Cooldown on reconnecting after connection drops
+  ~ Remember if socket fallback for tags is in use
+
 2014-09-13, 23:05:42 - Loopstream 1.3.11.0
   = Fix glitchy audio when volume boost lock is challenged by LOUD NOISES
   + Mixer test mode (if server address is blank in settings)