--- /dev/null
+/*
+ Copyright 2004-2005 Chris Tallon
+
+ This file is part of VOMP.
+
+ VOMP is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ VOMP is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with VOMP; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include "mark.h"
+
+Mark::Mark()
+{
+ pos = 0;
+}
+
+Mark::~Mark()
+{
+}
--- /dev/null
+/*
+ Copyright 2004-2005 Chris Tallon
+
+ This file is part of VOMP.
+
+ VOMP is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ VOMP is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with VOMP; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#ifndef MARK_H
+#define MARK_H
+
+#include <stdio.h>
+
+#include "defines.h"
+
+
+class Mark
+{
+ public:
+ Mark();
+ ~Mark();
+ int pos;
+};
+
+#endif
OBJECTS1 = command.o log.o tcp.o dsock.o thread.o timers.o i18n.o mutex.o \\r
message.o messagequeue.o udp.o \\r
vdr.o recman.o recording.o recinfo.o channel.o rectimer.o event.o \\r
- directory.o \\r
+ directory.o mark.o \\r
player.o playerradio.o vfeed.o afeed.o \\r
demuxer.o demuxervdr.o stream.o draintarget.o \\r
viewman.o box.o region.o colour.o view.o \\r
// unLock(); - let thread unlock this
}
+void Player::jumpToMark(int mark)
+{
+ lock();
+ logger->log("Player", Log::DEBUG, "JUMP TO MARK %i%%", mark);
+ switchState(S_JUMP, mark);
+// unLock(); - let thread unlock this
+}
+
void Player::skipForward(int seconds)
{
lock();
void jumpToPercent(int percent);
void skipForward(int seconds);
void skipBackward(int seconds);
+ void jumpToMark(int mark);
UCHAR getState() { return state; }
ULONG getCurrentFrameNum();
\r
Compatible MPEG2 decoders:\r
* Cyberlink PowerDVD 6\r
+* Nero Showtime 2 (from Nero Suite 6)\r
\r
Incompatible MPEG2 decoders:\r
* Cyperlink PowerDVD 4\r
STAR | *\r
HASH | Not implemented\r
\r
+Use Alt-Enter to toggle full screen mode.\r
+\r
Remote Controls tested with vomp on windows\r
===========================================\r
\r
Recording::Recording()
{
+ logger = Log::getInstance();
+ vdr = VDR::getInstance();
+
start = 0;
progName = NULL;
fileName = NULL;
index = -1;
+ markList = NULL;
}
Recording::~Recording()
if (progName) { delete[] progName; progName = NULL; }
if (fileName) { delete[] fileName; fileName = NULL; }
index = -1; // just in case
+
+ if (markList && markList->size())
+ {
+ for(UINT i = 0; i < markList->size(); i++)
+ {
+ delete (*markList)[i];
+ }
+ markList->clear();
+ Log::getInstance()->log("Recording", Log::DEBUG, "Recording destructor, marks list deleted");
+ }
+
+ if (markList) delete markList;
}
ULONG Recording::getStartTime() const
if (recInfo) delete recInfo;
recInfoFor = this;
- recInfo = VDR::getInstance()->getRecInfo(fileName);
+ recInfo = vdr->getRecInfo(fileName);
Log::getInstance()->log("Recording", Log::DEBUG, "Recording has loaded recInfo %p", recInfo);
}
recInfoFor = NULL;
}
-bool Recording::isRadio()
+void Recording::loadMarks()
{
- VDR* vdr = VDR::getInstance();
- if (!vdr) return false;
+ markList = vdr->getMarks(fileName);
+}
+bool Recording::isRadio()
+{
ULONG lengthFrames = 0;
ULLONG lengthBytes = vdr->streamRecording(getFileName(), &lengthFrames);
if (!lengthBytes || !lengthFrames) return false;
return false;
}
+int Recording::getPrevMark(int currentFrame)
+{
+ MarkList::reverse_iterator i;
+ Mark* loopMark = NULL;
+
+ if (!markList || !markList->size()) return 0;
+
+ for(i = markList->rbegin(); i != markList->rend(); i++)
+ {
+ loopMark = *i;
+ logger->log("Recording", Log::NOTICE, "findprev:comparing Frame %i with current Frame %i",loopMark->pos,currentFrame);
+
+ if (loopMark->pos < currentFrame)
+ {
+ logger->log("Recording", Log::NOTICE, "findprev:setting pos %i to jumpframe_target",loopMark->pos);
+ return loopMark->pos;
+ }
+ }
+
+ // No previous mark
+ return 0;
+}
+
+int Recording::getNextMark(int currentFrame)
+{
+ MarkList::iterator i;
+ Mark* loopMark = NULL;
+
+ if (!markList || !markList->size()) return 0;
+
+ for(i = markList->begin(); i != markList->end(); i++)
+ {
+ loopMark = *i;
+ logger->log("Recording", Log::NOTICE, "findnext:comparing Frame %i with current Frame %i",loopMark->pos,currentFrame);
+
+ if (loopMark->pos > currentFrame)
+ {
+ logger->log("Recording", Log::NOTICE, "findnext:setting pos %i to jumpframe_target",loopMark->pos);
+ return loopMark->pos;
+ }
+ }
+
+ // No next mark
+ return 0;
+}
+
+bool Recording::hasMarks()
+{
+ return (markList && markList->size());
+}
+
+MarkList* Recording::getMarkList()
+{
+ return markList;
+}
#include "defines.h"
#include "vdr.h"
#include "recinfo.h"
-
+#include "mark.h"
+#include "log.h"
#include "demuxer.h"
class Recording
bool isRadio();
+ void loadMarks();
+ int getPrevMark(int currentFrame);
+ int getNextMark(int currentFrame);
+ bool hasMarks();
+ MarkList* getMarkList();
+
static RecInfo* recInfo;
private:
+ Log* logger;
+ VDR* vdr;
+
ULONG start;
char* progName;
char* fileName;
// if (recInfoFor == this) then recInfo is valid
// else delete recInfo and reload for this recording
static Recording* recInfoFor;
+
+ MarkList* markList;
};
#endif
*totalFrames = lengthFrames;
return lengthBytes;
}
+
+MarkList* VDR::getMarks(char* fileName)
+{
+ unsigned long totalLength = 8 + strlen(fileName) + 1;
+ UCHAR* buffer = new UCHAR[totalLength];
+
+ *(unsigned long*)&buffer[0] = htonl(totalLength - 4);
+ *(unsigned long*)&buffer[4] = htonl(VDR_GETMARKS);
+ strcpy((char*)&buffer[8], fileName);
+
+ MUTEX_LOCK(&mutex);
+ if (!connected) { MUTEX_UNLOCK(&mutex); return 0; }
+
+ unsigned int a = tcp->sendPacket(buffer, totalLength);
+ delete []buffer;
+
+ if (a != totalLength)
+ {
+ disconnect();
+ MUTEX_UNLOCK(&mutex);
+ return NULL;
+ }
+
+ if (!getPacket())
+ {
+ MUTEX_UNLOCK(&mutex);
+ return NULL;
+ }
+
+ if (serverError())
+ {
+ MUTEX_UNLOCK(&mutex);
+ return NULL;
+ }
+
+ MarkList* markList = new MarkList();
+
+ while (packetPos < packetLength)
+ {
+ Mark* mark = new Mark();
+ mark->pos = extractULONG();
+
+ markList->push_back(mark);
+ Log::getInstance()->log("VDR", Log::DEBUG, "Have added a mark to list. %lu", mark->pos);
+ }
+
+ freePacket();
+ MUTEX_UNLOCK(&mutex);
+
+ return markList;
+}
#include "event.h"
#include "rectimer.h"
#include "recinfo.h"
+#include "mark.h"
using namespace std;
typedef vector<Event*> EventList;
typedef vector<Channel*> ChannelList;
typedef vector<RecTimer*> RecTimerList;
+typedef vector<Mark*> MarkList;
struct VDRServer
{
ULONG frameNumberFromPosition(ULLONG position);
bool getNextIFrame(ULONG frameNumber, ULONG direction, ULLONG* rfilePosition, ULONG* rframeNumber, ULONG* rframeLength);
// Direction: 0=backwards, 1=forwards
+ MarkList* getMarks(char* fileName);
ChannelList* getChannelsList(ULONG type);
int streamChannel(ULONG number);
const static ULONG VDR_MOVERECORDING = 18;
const static ULONG VDR_GETNEXTIFRAME = 19;
const static ULONG VDR_GETRECINFO = 20;
+ const static ULONG VDR_GETMARKS = 21;
int getPacket();
void freePacket();
if (toPlay)
{
toPlay->loadRecInfo(); // check if still need this
+ toPlay->loadMarks();
bool isRadio = toPlay->isRadio();
return 2;
}
case Remote::YELLOW:
+ {
+ if (myRec->hasMarks())
+ {
+ // skip to previous mark
+ Log* logger = Log::getInstance();
+ int currentFrame = (player->getCurrentFrameNum()); // get current Frame
+ currentFrame -= 5 * video->getFPS(); // subtrack 5 seconds, else you cannot skip more than once back ..
+
+ int prevMark = myRec->getPrevMark(currentFrame); // find previous Frame
+ if (prevMark)
+ {
+ logger->log("VVideoRec", Log::NOTICE, "jump back from pos %i to mark at %i",currentFrame,prevMark);
+ player->jumpToMark(prevMark);
+ }
+ doBar(4);
+ }
+ else
+ {
+ doBar(2);
+ player->skipBackward(10);
+ }
+ return 2;
+ }
+ case Remote::BLUE:
+ {
+ if (myRec->hasMarks())
+ {
+ // skip to next mark
+ Log* logger = Log::getInstance();
+ int currentFrame = (player->getCurrentFrameNum());
+
+ int nextMark = myRec->getNextMark(currentFrame);
+
+ if (nextMark)
+ {
+ logger->log("VVideoRec", Log::NOTICE, "jump forward from pos %i to mark at %i",currentFrame,nextMark);
+ player->jumpToMark(nextMark);
+ }
+ doBar(3);
+ }
+ else
+ {
+ doBar(1);
+ player->skipForward(10);
+ }
+ return 2;
+ }
+ case Remote::STAR:
{
doBar(2);
player->skipBackward(10);
return 2;
}
- case Remote::BLUE:
+ case Remote::HASH:
{
doBar(1);
player->skipForward(10);
rectangle(barRegion.x + progBarXbase + 4 + 302 - nrWidth, barRegion.y + 16, nrWidth, 16, Colour::RED);
}
- // Now calc position for start margin blips
int posPix;
+ // Now calc position for blips
- posPix = 302 * startMargin * video->getFPS() / lengthFrames;
+ if (myRec->hasMarks())
+ {
+ // Draw blips where there are cut marks
+ MarkList* markList = myRec->getMarkList();
+ MarkList::iterator i;
+ Mark* loopMark = NULL;
- rectangle(barRegion.x + progBarXbase + 2 + posPix, barRegion.y + 12 - 2, 2, 2, Colour::LIGHTTEXT);
- rectangle(barRegion.x + progBarXbase + 2 + posPix, barRegion.y + 12 + 24, 2, 2, Colour::LIGHTTEXT);
+ for(i = markList->begin(); i != markList->end(); i++)
+ {
+ loopMark = *i;
+ if (loopMark->pos)
+ {
+ logger->log("VVideoRec", Log::DEBUG, "Drawing mark at frame %i", loopMark->pos);
+ posPix = 302 * loopMark->pos / lengthFrames;
+ rectangle(barRegion.x + progBarXbase + 2 + posPix, barRegion.y + 12 - 2, 3, 28, Colour::DANGER);
+ }
+ }
+ }
+ else
+ {
+ // Draw blips where start and end margins probably are
+
+ posPix = 302 * startMargin * video->getFPS() / lengthFrames;
- posPix = 302 * (lengthFrames - endMargin * video->getFPS()) / lengthFrames;
+ rectangle(barRegion.x + progBarXbase + 2 + posPix, barRegion.y + 12 - 2, 2, 2, Colour::LIGHTTEXT);
+ rectangle(barRegion.x + progBarXbase + 2 + posPix, barRegion.y + 12 + 24, 2, 2, Colour::LIGHTTEXT);
- rectangle(barRegion.x + progBarXbase + 2 + posPix, barRegion.y + 12 - 2, 2, 2, Colour::LIGHTTEXT);
- rectangle(barRegion.x + progBarXbase + 2 + posPix, barRegion.y + 12 + 24, 2, 2, Colour::LIGHTTEXT);
+ posPix = 302 * (lengthFrames - endMargin * video->getFPS()) / lengthFrames;
+
+ rectangle(barRegion.x + progBarXbase + 2 + posPix, barRegion.y + 12 - 2, 2, 2, Colour::LIGHTTEXT);
+ rectangle(barRegion.x + progBarXbase + 2 + posPix, barRegion.y + 12 + 24, 2, 2, Colour::LIGHTTEXT);
+ }
}
void VVideoRec::removeBar()
projects / vompclient-marten.git / commitdiff