[vdr] [Announce] Teletext Subtitles - ttxtsubs plugin 0.0.5

Zitat

Original von flroi
Frage am Rande :
Warum stellst Du "Subtitel Mode: manual", statt "Subtitel Mode: auto"

Es ist doch praktisch, wenn man Unschaltet und die Untertitel werden von alleine eingeblendet.

Untertitel werden eingeblendet.
Manuell ist wegen Angabe der Untertextseite, weil Automatik mit den meisten deutschsprachigen Sendern nicht funktioniert.

Für die automatische Anzeige ist ja dass zuständig:
Einstellungen Plugins ttxtsub:
Zeige Untertitel: ja

hi to all,

i want install this plugin with new version of vdr....how can i install it??

what patch use? can it runs with bigpatch??

thanks!!

Patch vdr with vdr-1.4.3-subtitles-0.4.0-and-ttxtsubs-0.0.5.diff.gz and the Plugin with vdr-ttxtsubs-0.0.5-lusikkahaarukka-edition.diff.gz
Works here fine.

Ps, i dont know wath is in bigpatch.

hi Wilderigel,

can you tell me commands that you use for patching vdr and plugin??

thanks ,

PS: i never patch a plugin, i don't know how made it..

see you soon

Do you use a pre-compiled vdr?

You must use sources of vdr and plugins.
http://linuxtv.org/vdrwiki/index.php/VDR_installation

man patch should show you some options.

normaly unpack the patch and use
patch -p1 (may be different) < patch.diff

In the german Wiki there is an good description, but in the english Wiki not.

i use not vdr precompiled, i compile always with command,

make clean
make clean-plugins
make
make plugins

if i use that patch for plugin i have this error:

root@KanotixBox:/temp/vdr-1.4.3# patch -p1 --dry-run < PLUGINS/src/ttxtsubs/vdr-ttxtsubs-0.0.5-lusikkahaarukka-edition.diff
patching file Makefile
Hunk #1 FAILED at 31.
Hunk #2 FAILED at 48.
Hunk #3 FAILED at 76.
3 out of 3 hunks FAILED -- saving rejects to file Makefile.rej
can't find file to patch at input line 41
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru ttxtsubs-0.0.5/siinfo.c ttxtsubs-0.0.5-lusikkahaarukka-edition/siinfo.c
|--- ttxtsubs-0.0.5/siinfo.c 2006-06-11 13:25:10.000000000 +0300
|+++ ttxtsubs-0.0.5-lusikkahaarukka-edition/siinfo.c 2006-06-11 13:25:11.000000000 +0300
--------------------------
File to patch:

how can i resolve??

the directory in plugin must be named ttxtsubs or ttxtsubs-0.0.5 or ttxtsubs-0.0.5-lusikkahaarukka-edition ???

now it's all ok!! thanks!!

i have download original version from site and now it's good.

seee ya later

Zitat

Original von dacorsa
root@KanotixBox:/temp/vdr-1.4.3# patch -p1 --dry-run < PLUGINS/src/ttxtsubs/vdr-ttxtsubs-0.0.5-lusikkahaarukka-edition.diff

This patch is for the Plugin, not for the vdr

cd PLUGINS/src/ttxtsubs/
root@KanotixBox:/temp/vdr-1.4.3/PLUGINS/src/ttxtsubs# patch -p1 --dry-run < vdr-ttxtsubs-0.0.5-lusikkahaarukka-edition.diff

ok thanks now works well, i have test already. but i'm sorry that not can patch vdr with bigpatch and ttxtsubs at same time.

this is bigpatch :

http://bigpatch.vdr-developer.org/

or you can download last version for vdr 1.4.3-3 from Marc, zulu:

http://www.zulu-entertainment.de/download.php?group=VDR

is the first link...

bp-33.12_vdr-1.4.3.tar.gz

Hallo,

ich versuche schon seit einiger Zeit ttxtsubs und den bigpatch zusammenzubringen.
Leider komme ich an einer Stelle nicht weiter. Problem ist, das durch den bigpatch in recorder.c eine Klasse(?) (class cFileWriter : public cThread) ganz entfernt wird. Der Patch für ttxtsubs (vdr-1.4.3-subtitles-0.4.0-and-ttxtsubs-0.0.5.diff) will in dieser Klasse folgendes ändern:

diff -Nru vdr-1.4.3-vanilla/recorder.c vdr-1.4.3-subtitles/recorder.c
--- vdr-1.4.3-vanilla/recorder.c	2006-09-23 20:10:01.000000000 +0300
+++ vdr-1.4.3-subtitles/recorder.c	2006-09-23 20:12:58.000000000 +0300
@@ -23,6 +24,7 @@
 
 class cFileWriter : public cThread {
 private:
+  cTtxtSubsRecorderBase *ttxtSubsRecorder;
   cRemux *remux;
   cFileName *fileName;
   cIndexFile *index;

Das geht nun nicht und die Fehlermeldung beim anschliessenden make ist dann:

g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\"  menu.c
menu.c: In constructor 'cRecordControl::cRecordControl(cDevice*, cTimer*, bool, bool, bool)':
menu.c:4393: error: no matching function for call to 'cRecorder::cRecorder(char*&, int, int, int, const int*, const int*, const int*, bool, bool&, int [3], cTtxtSubsRecorderBase*&)'
recorder.h:58: note: candidates are: cRecorder::cRecorder(const char*, int, int, int, const int*, const int*, const int*, cTtxtSubsRecorderBase*, bool, bool)
recorder.h:46: note:                 cRecorder::cRecorder(const cRecorder&)
make: *** [menu.o] Fehler 1

Wo kann das "cTtxtSubsRecorderBase *ttxtSubsRecorder;" jetzt untergebracht werden?

Gruss
Marc

Die Klasse ist zu recorder.h gewandert.

Danke für die Antwort, komme leider trotzdem nicht weiter.

So habe ich es jetzt in recorder.h eingefügt:

/*
 * recorder.h: The actual DVB recorder
 *
 * See the main source file 'vdr.c' for copyright information and
 * how to reach the author.
 *
 * $Id: recorder.h 1.4 2005/08/13 11:31:18 kls Exp $
 */


#ifndef __RECORDER_H
#define __RECORDER_H


#include "receiver.h"
#include "recording.h"
#include "remux.h"
#include "ringbuffer.h"
#include "thread.h"
#include "vdrttxtsubshooks.h"


class cFileWriter : public cThread {
friend class cCuttingThread;
private:
  cTtxtSubsRecorderBase *ttxtSubsRecorder;
  bool isLiveRec;
  bool isBeginning;
  bool ResumeLiveRec;
  char* filename;
  u_int64_t pts;
  cRemux *remux;
  cFileName *fileName;
  cIndexFile *index;
  uchar pictureType;
  int fileSize;
  cUnbufferedFile *recordFile;
  time_t lastDiskSpaceCheck;
  bool RunningLowOnDiskSpace(void);
  bool NextFile(void);
protected:
  virtual void Action(void);
public:
  cFileWriter(const char *FileName, cRemux *Remux, cTtxtSubsRecorderBase *tsr, bool IsLiveRec = false, bool IsBeginning = false);
  virtual ~cFileWriter();
  void SetNewRemux(cRemux *Remux) {remux=Remux;}
  void RecordNextIFrame(u_int64_t PTS);
  };


class cRecorder : public cReceiver, cThread {
private:
  bool isLiveRec;
  bool attached;
  cRingBufferLinear *ringBuffer;
  cRemux *remux,*oldRemux;
  cFileWriter *writer;
protected:
  virtual void Activate(bool On);
  virtual void Receive(uchar *Data, int Length);
  virtual void Action(void);
public:
  cRecorder(const char *FileName, int Ca, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids,  cTtxtSubsRecorderBase *tsr, bool IsLiveRec = false, bool IsBeginning = false);
               // Creates a new recorder that requires conditional access Ca, has
               // the given Priority and will record the given PIDs into the file FileName.
  virtual ~cRecorder();
  void ChangePIDs(cDevice *Device, int VPid, const int *APids, const int *DPids, const int *SPids);
  cFileWriter *GetWriter() {return writer;}
  bool IsAttached() {return attached;}
  };


#endif //__RECORDER_H

aber die Fehlermeldung:

g++ -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\"  menu.c
menu.c: In constructor 'cRecordControl::cRecordControl(cDevice*, cTimer*, bool, bool, bool)':
menu.c:4393: error: no matching function for call to 'cRecorder::cRecorder(char*&, int, int, int, const int*, const int*, const int*, bool, bool&, int [3], cTtxtSubsRecorderBase*&)'
recorder.h:59: note: candidates are: cRecorder::cRecorder(const char*, int, int, int, const int*, const int*, const int*, cTtxtSubsRecorderBase*, bool, bool)
recorder.h:47: note:                 cRecorder::cRecorder(const cRecorder&)
make: *** [menu.o] Fehler 1

...bleibt fast gleich.

Grus
Marc

thanks Marc for all you are doing for us, what means this code above?

see ya soon

ugo

hi ugo,

I have fixed all rejects that comes with vdr-1.4.3-subtitles-0.4.0-and-ttxtsubs-0.0.5.diff after the bigpatch. But it's still not working so I ask if someone nows why.

bye
Marc

ok, i hope will be possibile use it with your bigpatch in future, so thanks Marc

best regards.

hi ugo,

maybe I got it. you can test it with bp-33.13_vdr-1.4.3 and the attached patch. do not use the patch together with the subtitles patch that comes with x-vdr.

bye

Hallo,

wie oben geschrieben läuft der Patch jetzt durch und der VDR lässt sich kompilieren.

Da ich aber eigendlich keinen Plan von C habe hätte ich da noch was...

In transfer.c wird vom LiveBuffer Patch unter anderem folgendes erstellt:

cLiveRecorder::cLiveRecorder(cDevice *ReceiverDevice, const cChannel *Channel)
{
  start = time(NULL);
  New = true;
  receiverDevice = ReceiverDevice;
  channelID = tChannelID::tChannelID(Channel->Source(),Channel->Nid(),Channel->Tid(),Channel->Sid(),Channel->Rid());
  Pids.VPid=Channel->Vpid();
  for (int i=0; i<=MAXAPIDS; i++) 
     Pids.APids[i] = Channel->Apid(i);
  for (int i=0; i<=MAXDPIDS; i++)
     Pids.DPids[i] = Channel->Dpid(i);
  for (int i=0; i<=MAXSPIDS; i++)
     Pids.SPids[i] = Channel->Spid(i);
  Rew=false;
  sprintf(FileName,"%s/LiveBuffer/%s",BufferDirectory,Channel->Name());
  while (DirectoryOk(FileName,false))
    sprintf(FileName,"%s_",FileName);
  MakeDirs(FileName,true);
  Recorder=new cRecorder(FileName, 0, -1,Channel->Vpid(), Channel->Apids(),Channel->Dpids(),Channel->Spids(),true);
  while (!cLiveRecorderControl::LiveThread->wantadd && !ReceiverDevice->HasLock())
    usleep(100);
  if (!cLiveRecorderControl::LiveThread->wantadd)
    ReceiverDevice->AttachReceiver(Recorder);
  WriteInfo();
  while (cControl::Control() && !cControl::Control()->Attached() && !cLiveRecorderControl::LiveThread->wantadd)
    usleep(100);
  Text(text);
  cReplayControl::SetRecording(FileName,text, true);
  replay=NULL;
  if (cDevice::PrimaryDevice()->Replaying() && !cControl::Control())
    return;
  if (!cLiveRecorderControl::LiveThread->wantadd)
    cControl::Launch(replay = new cReplayControl(true,this));
}

Dort habe ich dann die Zeile mit:

Recorder=new cRecorder(FileName, 0, -1,Channel->Vpid(), Channel->Apids(),Channel->Dpids(),Channel->Spids(),true);

so geändert:

Recorder=new cRecorder(FileName, 0, -1, Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids(), 0, true);

Die dazupassende Zeile in recorder.h ist oben zusehen.

Frage: Sollte da anstatt der "0" nicht besser was anderes hin?
Ich vermute das die Untertitel jetzt im Replaymode nicht angezeigt werden.

EDIT:
Habe gerade mal mit einem Film auf dem Ersten getestet, der auf Seite 150 im Teletext einen Untertitel hatte. Leider wurde mit ttextsubs nichts angezeigt.

Gruss
Marc

hi Marc,

i test now and tell if works!!

thanks forever!!

works very well!

i test for 5-10 minutes but all ok,

[Blockierte Grafik: http://img167.imageshack.us/img167/1820/vdrcontrol3wc6.png]

THANKS MARC!!