Cut marks support

diff --git a/mvpclient.c b/mvpclient.c
index 87a8cfb552524f38470ba6dc632058fe797129d7..a4c3dac913ced372869736c1a73752252bdcfa90 100644 (file)
--- a/mvpclient.c
+++ b/mvpclient.c
@@ -246,6 +246,9 @@ void MVPClient::run2()
       case 20:
         result = processGetRecInfo(data, packetLength);
         break;
+      case 21:
+        result = processGetMarks(data, packetLength);
+        break;
     }
 
     free(buffer);
@@ -1756,3 +1759,53 @@ int MVPClient::processReScanRecording(UCHAR* data, int length)
 }
 
 // FIXME without client calling rescan, getblock wont work even tho more data is avail
+
+
+int MVPClient::processGetMarks(UCHAR* data, int length)
+{
+  // data is a pointer to the fileName string
+
+  UCHAR* sendBuffer = new UCHAR[50000]; // FIXME hope this is enough
+  int count = 4; // leave space for the packet length
+
+
+  cMarks Marks;
+  cRecordings Recordings;
+  Recordings.Load(); // probably have to do this
+
+  cRecording *recording = Recordings.GetByName((char*)data);
+
+  log->log("Client", Log::DEBUG, "recording pointer %p", recording);
+
+  if (recording)
+  {
+    Marks.Load(recording->FileName());
+    if (Marks.Count())
+    {
+      for (const cMark *m = Marks.First(); m; m = Marks.Next(m))
+      {
+        log->log("Client", Log::DEBUG, "found Mark %i", m->position);
+
+        if (count > 49000) break;
+        *(ULONG*)&sendBuffer[count] = htonl(m->position);
+        count += 4;
+      }
+    }
+    else
+    {
+      log->log("Client", Log::DEBUG, "no marks found, sending 0-mark");
+      *(ULONG*)&sendBuffer[count] = htonl(0);
+      count += 4;
+    }
+  }
+
+  *(ULONG*)&sendBuffer[0] = htonl(count - 4); // -4 :  take off the size field
+
+  log->log("Client", Log::DEBUG, "recorded size as %u", ntohl(*(ULONG*)&sendBuffer[0]));
+
+  tcp.sendPacket(sendBuffer, count);
+  delete[] sendBuffer;
+  log->log("Client", Log::DEBUG, "Written Marks list");
+
+  return 1;
+}

diff --git a/mvpclient.h b/mvpclient.h
index 27d0d9e142dc7888d56f152678193a7deb1d7573..063e2720369592e16eaeed080c0e39c39bb8e6e6 100644 (file)
--- a/mvpclient.h
+++ b/mvpclient.h
@@ -82,6 +82,7 @@ class MVPClient
     int processFrameNumberFromPosition(UCHAR* data, int length);
     int processGetIFrame(UCHAR* data, int length);
     int processGetRecInfo(UCHAR* data, int length);
+    int processGetMarks(UCHAR* data, int length);
 
     int processReScanRecording(UCHAR* data, int length);           // FIXME obselete