Merge branch 'development' into LTS_development

# Conflicts:
#	src/input/input_dtsc.cpp
#	src/output/output.cpp

src/output/output.cpp

@@ -68,6 +68,10 @@ namespace Mist {
     myConn.setBlocking(isBlocking);
   }
   
+  uint32_t Output::currTrackCount() const{
+    return buffer.size();
+  }
+
   void Output::updateMeta(){
     //read metadata from page to myMeta variable
     if (nProxy.metaPages[0].mapped){

src/output/output.h

@@ -65,6 +65,7 @@ namespace Mist {
       void selectDefaultTracks();
       bool connectToFile(std::string file);
       static bool listenMode(){return true;}
+      uint32_t currTrackCount() const;
       virtual bool isReadyForPlay();
       //virtuals. The optional virtuals have default implementations that do as little as possible.
       virtual void sendNext() {}//REQUIRED! Others are optional.