frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Using SetCurrentChannel(int ChannelNumber) instead of the deprecated SetCurrentChannel(const cChannel *Channel)

Browse Source
This commit is contained in:
Klaus Schmidinger 2016-12-08 10:48:53 +01:00
parent 12308b3c29
commit d6c26af696
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 4.14 2016/12/08 10:39:29 kls Exp $ * $Id: menu.c 4.15 2016/12/08 10:48:16 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -520,7 +520,7 @@ eOSState cMenuChannels::Delete(void)
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
Channels->SwitchTo(CurrentChannel->Number()); Channels->SwitchTo(CurrentChannel->Number());
else else
cDevice::SetCurrentChannel(CurrentChannel); cDevice::SetCurrentChannel(CurrentChannel->Number());
} }
} }
channelsStateKey.Remove(Deleted); channelsStateKey.Remove(Deleted);
@ -547,7 +547,7 @@ void cMenuChannels::Move(int From, int To)
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
Channels->SwitchTo(CurrentChannel->Number()); Channels->SwitchTo(CurrentChannel->Number());
else else
cDevice::SetCurrentChannel(CurrentChannel); cDevice::SetCurrentChannel(CurrentChannel->Number());
} }
} }
channelsStateKey.Remove(); channelsStateKey.Remove();

6
svdrp.c
View File

@ -10,7 +10,7 @@
* and interact with the Video Disk Recorder - or write a full featured * and interact with the Video Disk Recorder - or write a full featured
* graphical interface that sits on top of an SVDRP connection. * graphical interface that sits on top of an SVDRP connection.
* *
* $Id: svdrp.c 4.10 2016/12/08 09:51:02 kls Exp $ * $Id: svdrp.c 4.11 2016/12/08 10:48:53 kls Exp $
*/ */
#include "svdrp.h" #include "svdrp.h"
@ -1244,7 +1244,7 @@ void cSVDRPServer::CmdDELC(const char *Option)
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
Channels->SwitchTo(CurrentChannel->Number()); Channels->SwitchTo(CurrentChannel->Number());
else else
cDevice::SetCurrentChannel(CurrentChannel); cDevice::SetCurrentChannel(CurrentChannel->Number());
} }
Reply(250, "Channel \"%s\" deleted", Option); Reply(250, "Channel \"%s\" deleted", Option);
} }
@ -1903,7 +1903,7 @@ void cSVDRPServer::CmdMOVC(const char *Option)
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
Channels->SwitchTo(CurrentChannel->Number()); Channels->SwitchTo(CurrentChannel->Number());
else else
cDevice::SetCurrentChannel(CurrentChannel); cDevice::SetCurrentChannel(CurrentChannel->Number());
} }
isyslog("SVDRP < %s channel %d moved to %d", *connection, FromNumber, ToNumber); isyslog("SVDRP < %s channel %d moved to %d", *connection, FromNumber, ToNumber);
Reply(250,"Channel \"%d\" moved to \"%d\"", From, To); Reply(250,"Channel \"%d\" moved to \"%d\"", From, To);