[mythtv] dvb_on_demand fix

[Julian Scheel]

Am Mittwoch, 4. August 2004 17:52 schrieb Isaac Richards:
> On Wednesday 04 August 2004 06:41 am, Julian Scheel wrote:
> > Am Dienstag, 3. August 2004 17:15 schrieb Isaac Richards:
> > > On Tuesday 03 August 2004 05:40 am, Julian Scheel wrote:
> > > > Am Dienstag, 3. August 2004 00:22 schrieb Isaac Richards:
> > > > > On Friday 30 July 2004 08:22 am, Julian Scheel wrote:
> > > > > > Any chance to get this commited?
> > > > >
> > > > > No need for it to be, someone else submitted a similar fix as part
> > > > > of a larger patch.
> > > >
> > > > Christopher Pascoes fixes didn't solve the problem for me. I built
> > > > this patch after I aplied his patch.
> > >
> > > No, you didn't.  Your patch does not apply to what's in CVS.
> >
> > I had. I just looked into it another time and saw that Christopher added
> > the diseqc delete statement into the ~DVBChannel routine, but this does
> > not work (for me), because it also has to be deleted, if CloseDVB() is
> > called from DVBRecorder. So it has to be in CloseDVB() like it is in my
> > patch. My patch may have not applied cleanly, because my CVS version was
> > a few weeks old, but I had Christophers patch installed.
>
> This is the patch you sent to the list:
>
> diff -u -w -r1.25 dvbchannel.cpp
> --- libs/libmythtv/dvbchannel.cpp       25 Jun 2004 23:31:58 -0000     
> 1.25 +++ libs/libmythtv/dvbchannel.cpp       26 Jul 2004 11:58:16 -0000 @@
> -78,6 +78,11 @@
>          delete dvbsct;
>      if (dvbcam)
>          delete dvbcam;
> +    if (diseqc)
> +    {
> +        delete diseqc;
> +        diseqc = NULL;
> +    }
>
>      CloseDVB();
>  }
>
> As anyone can see, your patch only adds the delete to the destructor, not
> to CloseDVB().
>
> Isaac

You're right. That's really weird, because in my tree I'm working it it's in 
CloseDVB(). And with Christophers patch it's in ~DVBChannel.
I must have mixed up different versions or something like that.
I attached a new patch against todays CVS which makes it working for me.

Julian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dvb_on_demand.patch
Type: text/x-diff
Size: 700 bytes
Desc: not available
Url : http://mythtv.org/pipermail/mythtv-dev/attachments/20040804/40a14596/dvb_on_demand.bin