A really rubbish hack way of identifying radio streams

diff --git a/recording.cc b/recording.cc
index c0d1157f19e4e85a4d0e571084077336357cbd54..c0af7afa2422e4f1f12c59dfd103615416806222 100644 (file)
--- a/recording.cc
+++ b/recording.cc
@@ -90,3 +90,35 @@ void Recording::dropRecInfo()
   recInfo = NULL;
   recInfoFor = NULL;
 }
+
+bool Recording::isRadio()
+{
+  VDR* vdr = VDR::getInstance();
+  if (!vdr) return false;
+
+  ULONG lengthFrames = 0;
+  ULLONG lengthBytes = vdr->streamRecording(getFileName(), &lengthFrames);
+  if (!lengthBytes || !lengthFrames) return false;
+
+  UINT thisRead;
+  UCHAR* buffer = vdr->getBlock(0ULL, 250000U, &thisRead);
+  if (!buffer) return false;
+
+  if (!thisRead)
+  {
+    free(buffer);
+    return false;
+  }
+
+  bool hasVideo = Demuxer::scanForVideo(buffer, thisRead);
+
+  free(buffer);
+
+  // FIXME
+  vdr->stopStreaming();
+
+
+  if (!hasVideo) return true;
+  return false;
+}
+

diff --git a/recording.h b/recording.h
index 03dbc6391b33736a2766416fbb451d092ee5550f..e1eaba5069cc68191227b7a17e71966afc750216 100644 (file)
--- a/recording.h
+++ b/recording.h
@@ -27,6 +27,8 @@
 #include "vdr.h"
 #include "recinfo.h"
 
+#include "demuxer.h"
+
 class Recording
 {
   public:
@@ -46,6 +48,8 @@ class Recording
     void loadRecInfo();
     void dropRecInfo();
 
+    bool isRadio();
+
     static RecInfo* recInfo;
 
   private:

diff --git a/vrecordinglist.cc b/vrecordinglist.cc
index 8aa39f7cc00e553f8e350288cd0b5b4f27427224..46d46dbc9e30f57741c2c0f69bc7dd18a1833444 100644 (file)
--- a/vrecordinglist.cc
+++ b/vrecordinglist.cc
@@ -296,8 +296,11 @@ int VRecordingList::doPlay(bool resume)
   Recording* toPlay = getCurrentOptionRecording();
   if (toPlay)
   {
-    toPlay->loadRecInfo();
-    if (toPlay->recInfo->hasNoVideo())
+    toPlay->loadRecInfo(); // check if still need this
+
+    bool isRadio = toPlay->isRadio();
+
+    if (isRadio)
     {
       VRadioRec* radrec = new VRadioRec(toPlay);
       radrec->draw();