[SCM] kodi-pvr-vdr-vnsi/master: requestpacket: change "bool" return types to "void"
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Sun Feb 28 15:46:50 UTC 2016
The following commit has been merged in the master branch:
commit d7246df2a81933e9c7d2ee9cc9c3361be3c92813
Author: Max Kellermann <max at duempel.org>
Date: Sat Nov 7 23:02:54 2015 +0100
requestpacket: change "bool" return types to "void"
All "false" code paths have been changed to throw an exception. This
is a big code simplification which also makes the code safer. Many
caller locations did not check for errors.
diff --git a/src/VNSIAdmin.cpp b/src/VNSIAdmin.cpp
index dc88eb4..5bd1c40 100644
--- a/src/VNSIAdmin.cpp
+++ b/src/VNSIAdmin.cpp
@@ -882,10 +882,10 @@ bool cVNSIAdmin::OnClick(int controlId)
{
int value = m_spinTimeshiftMode->GetValue();
cRequestPacket vrp;
- if (!vrp.init(VNSI_STORESETUP) ||
- !vrp.add_String(CONFNAME_TIMESHIFT) ||
- !vrp.add_U32(value) ||
- !ReadSuccess(&vrp))
+ vrp.init(VNSI_STORESETUP);
+ vrp.add_String(CONFNAME_TIMESHIFT);
+ vrp.add_U32(value);
+ if (!ReadSuccess(&vrp))
{
XBMC->Log(LOG_ERROR, "%s - failed to set timeshift mode", __FUNCTION__);
}
@@ -895,10 +895,10 @@ bool cVNSIAdmin::OnClick(int controlId)
{
int value = m_spinTimeshiftBufferRam->GetValue();
cRequestPacket vrp;
- if (!vrp.init(VNSI_STORESETUP) ||
- !vrp.add_String(CONFNAME_TIMESHIFTBUFFERSIZE) ||
- !vrp.add_U32(value) ||
- !ReadSuccess(&vrp))
+ vrp.init(VNSI_STORESETUP);
+ vrp.add_String(CONFNAME_TIMESHIFTBUFFERSIZE);
+ vrp.add_U32(value);
+ if (!ReadSuccess(&vrp))
{
XBMC->Log(LOG_ERROR, "%s - failed to set timeshift buffer", __FUNCTION__);
}
@@ -908,10 +908,10 @@ bool cVNSIAdmin::OnClick(int controlId)
{
int value = m_spinTimeshiftBufferFile->GetValue();
cRequestPacket vrp;
- if (!vrp.init(VNSI_STORESETUP) ||
- !vrp.add_String(CONFNAME_TIMESHIFTBUFFERFILESIZE) ||
- !vrp.add_U32(value) ||
- !ReadSuccess(&vrp))
+ vrp.init(VNSI_STORESETUP);
+ vrp.add_String(CONFNAME_TIMESHIFTBUFFERFILESIZE);
+ vrp.add_U32(value);
+ if (!ReadSuccess(&vrp))
{
XBMC->Log(LOG_ERROR, "%s - failed to set timeshift buffer file", __FUNCTION__);
}
@@ -1036,11 +1036,7 @@ bool cVNSIAdmin::OnInit()
m_renderControl->Init();
cRequestPacket vrp;
- if (!vrp.init(VNSI_OSD_HITKEY))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_OSD_HITKEY);
vrp.add_U32(0);
cVNSISession::TransmitMessage(&vrp);
#endif
@@ -1054,11 +1050,8 @@ bool cVNSIAdmin::OnInit()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_GETSETUP) || !vrp.add_String(CONFNAME_TIMESHIFT))
- {
- XBMC->Log(LOG_ERROR, "%s - failed to get timeshift mode", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_GETSETUP);
+ vrp.add_String(CONFNAME_TIMESHIFT);
auto resp = ReadResult(&vrp);
if (!resp)
{
@@ -1080,11 +1073,8 @@ bool cVNSIAdmin::OnInit()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_GETSETUP) || !vrp.add_String(CONFNAME_TIMESHIFTBUFFERSIZE))
- {
- XBMC->Log(LOG_ERROR, "%s - failed to get timeshift buffer size", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_GETSETUP);
+ vrp.add_String(CONFNAME_TIMESHIFTBUFFERSIZE);
auto resp = ReadResult(&vrp);
if (!resp)
{
@@ -1104,11 +1094,8 @@ bool cVNSIAdmin::OnInit()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_GETSETUP) || !vrp.add_String(CONFNAME_TIMESHIFTBUFFERFILESIZE))
- {
- XBMC->Log(LOG_ERROR, "%s - failed to get timeshift buffer (file) size", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_GETSETUP);
+ vrp.add_String(CONFNAME_TIMESHIFTBUFFERFILESIZE);
auto resp = ReadResult(&vrp);
if (!resp)
{
@@ -1146,11 +1133,7 @@ bool cVNSIAdmin::OnAction(int actionId)
{
// send all actions to vdr
cRequestPacket vrp;
- if (!vrp.init(VNSI_OSD_HITKEY))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_OSD_HITKEY);
vrp.add_U32(actionId);
cVNSISession::TransmitMessage(&vrp);
return true;
@@ -1386,8 +1369,7 @@ bool cVNSIAdmin::OnResponsePacket(cResponsePacket* resp)
bool cVNSIAdmin::ConnectOSD()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_OSD_CONNECT))
- return false;
+ vrp.init(VNSI_OSD_CONNECT);
auto vresp = ReadResult(&vrp);
if (vresp == NULL || vresp->noResponse())
@@ -1405,21 +1387,9 @@ bool cVNSIAdmin::ConnectOSD()
bool cVNSIAdmin::ReadChannelList(bool radio)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_CHANNELS_GETCHANNELS))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
- if (!vrp.add_U32(radio))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't add parameter to cRequestPacket", __FUNCTION__);
- return false;
- }
- if (!vrp.add_U8(0)) // apply no filter
- {
- XBMC->Log(LOG_ERROR, "%s - Can't add parameter to cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_CHANNELS_GETCHANNELS);
+ vrp.add_U32(radio);
+ vrp.add_U8(0); // apply no filter
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -1460,16 +1430,8 @@ bool cVNSIAdmin::ReadChannelList(bool radio)
bool cVNSIAdmin::ReadChannelWhitelist(bool radio)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_CHANNELS_GETWHITELIST))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
- if (!vrp.add_U8(radio))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't add parameter to cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_CHANNELS_GETWHITELIST);
+ vrp.add_U8(radio);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -1496,16 +1458,8 @@ bool cVNSIAdmin::SaveChannelWhitelist(bool radio)
m_channels.ExtractProviderWhitelist();
cRequestPacket vrp;
- if (!vrp.init(VNSI_CHANNELS_SETWHITELIST))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
- if (!vrp.add_U8(radio))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't add parameter to cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_CHANNELS_SETWHITELIST);
+ vrp.add_U8(radio);
for (const auto &provider : m_channels.m_providerWhitelist)
{
@@ -1526,16 +1480,8 @@ bool cVNSIAdmin::SaveChannelWhitelist(bool radio)
bool cVNSIAdmin::ReadChannelBlacklist(bool radio)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_CHANNELS_GETBLACKLIST))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
- if (!vrp.add_U8(radio))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't add parameter to cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_CHANNELS_GETBLACKLIST);
+ vrp.add_U8(radio);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -1559,16 +1505,8 @@ bool cVNSIAdmin::SaveChannelBlacklist(bool radio)
m_channels.ExtractChannelBlacklist();
cRequestPacket vrp;
- if (!vrp.init(VNSI_CHANNELS_SETBLACKLIST))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
- if (!vrp.add_U8(radio))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't add parameter to cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_CHANNELS_SETBLACKLIST);
+ vrp.add_U8(radio);
for (auto b : m_channels.m_channelBlacklist)
{
diff --git a/src/VNSIChannelScan.cpp b/src/VNSIChannelScan.cpp
index 07ff7b6..1a305ae 100644
--- a/src/VNSIChannelScan.cpp
+++ b/src/VNSIChannelScan.cpp
@@ -142,20 +142,20 @@ void cVNSIChannelScan::StartScan()
cRequestPacket vrp;
uint32_t retCode = VNSI_RET_ERROR;
- if (!vrp.init(VNSI_SCAN_START)) goto SCANError;
- if (!vrp.add_U32(source)) goto SCANError;
- if (!vrp.add_U8(m_radioButtonTV->IsSelected())) goto SCANError;
- if (!vrp.add_U8(m_radioButtonRadio->IsSelected())) goto SCANError;
- if (!vrp.add_U8(m_radioButtonFTA->IsSelected())) goto SCANError;
- if (!vrp.add_U8(m_radioButtonScrambled->IsSelected())) goto SCANError;
- if (!vrp.add_U8(m_radioButtonHD->IsSelected())) goto SCANError;
- if (!vrp.add_U32(m_spinCountries->GetValue())) goto SCANError;
- if (!vrp.add_U32(m_spinDVBCInversion->GetValue())) goto SCANError;
- if (!vrp.add_U32(m_spinDVBCSymbolrates->GetValue())) goto SCANError;
- if (!vrp.add_U32(m_spinDVBCqam->GetValue())) goto SCANError;
- if (!vrp.add_U32(m_spinDVBTInversion->GetValue())) goto SCANError;
- if (!vrp.add_U32(m_spinSatellites->GetValue())) goto SCANError;
- if (!vrp.add_U32(m_spinATSCType->GetValue())) goto SCANError;
+ vrp.init(VNSI_SCAN_START);
+ vrp.add_U32(source);
+ vrp.add_U8(m_radioButtonTV->IsSelected());
+ vrp.add_U8(m_radioButtonRadio->IsSelected());
+ vrp.add_U8(m_radioButtonFTA->IsSelected());
+ vrp.add_U8(m_radioButtonScrambled->IsSelected());
+ vrp.add_U8(m_radioButtonHD->IsSelected());
+ vrp.add_U32(m_spinCountries->GetValue());
+ vrp.add_U32(m_spinDVBCInversion->GetValue());
+ vrp.add_U32(m_spinDVBCSymbolrates->GetValue());
+ vrp.add_U32(m_spinDVBCqam->GetValue());
+ vrp.add_U32(m_spinDVBTInversion->GetValue());
+ vrp.add_U32(m_spinSatellites->GetValue());
+ vrp.add_U32(m_spinATSCType->GetValue());
{
auto vresp = ReadResult(&vrp);
@@ -180,8 +180,7 @@ SCANError:
void cVNSIChannelScan::StopScan()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_SCAN_STOP))
- return;
+ vrp.init(VNSI_SCAN_STOP);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -440,8 +439,7 @@ bool cVNSIChannelScan::ReadCountries()
//dvdlang = dvdlang.ToUpper();
cRequestPacket vrp;
- if (!vrp.init(VNSI_SCAN_GETCOUNTRIES))
- return false;
+ vrp.init(VNSI_SCAN_GETCOUNTRIES);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -476,8 +474,7 @@ bool cVNSIChannelScan::ReadSatellites()
m_spinSatellites->Clear();
cRequestPacket vrp;
- if (!vrp.init(VNSI_SCAN_GETSATELLITES))
- return false;
+ vrp.init(VNSI_SCAN_GETSATELLITES);
auto vresp = ReadResult(&vrp);
if (!vresp)
diff --git a/src/VNSIData.cpp b/src/VNSIData.cpp
index 2584c67..a9b2db2 100644
--- a/src/VNSIData.cpp
+++ b/src/VNSIData.cpp
@@ -120,11 +120,7 @@ std::unique_ptr<cResponsePacket> cVNSIData::ReadResult(cRequestPacket* vrp)
bool cVNSIData::GetDriveSpace(long long *total, long long *used)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECORDINGS_DISKSIZE))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_RECORDINGS_DISKSIZE);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -150,11 +146,7 @@ bool cVNSIData::GetDriveSpace(long long *total, long long *used)
bool cVNSIData::SupportChannelScan()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_SCAN_SUPPORTED))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_SCAN_SUPPORTED);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -172,11 +164,7 @@ bool cVNSIData::SupportRecordingsUndelete()
if (GetProtocol() > 7)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECORDINGS_DELETED_ACCESS_SUPPORTED))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_RECORDINGS_DELETED_ACCESS_SUPPORTED);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -196,8 +184,8 @@ bool cVNSIData::SupportRecordingsUndelete()
bool cVNSIData::EnableStatusInterface(bool onOff)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_ENABLESTATUSINTERFACE)) return false;
- if (!vrp.add_U8(onOff)) return false;
+ vrp.init(VNSI_ENABLESTATUSINTERFACE);
+ vrp.add_U8(onOff);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -213,11 +201,7 @@ bool cVNSIData::EnableStatusInterface(bool onOff)
int cVNSIData::GetChannelsCount()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_CHANNELS_GETCOUNT))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return -1;
- }
+ vrp.init(VNSI_CHANNELS_GETCOUNT);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -233,21 +217,9 @@ int cVNSIData::GetChannelsCount()
bool cVNSIData::GetChannelsList(ADDON_HANDLE handle, bool radio)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_CHANNELS_GETCHANNELS))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
- if (!vrp.add_U32(radio))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't add parameter to cRequestPacket", __FUNCTION__);
- return false;
- }
- if (!vrp.add_U8(1)) // apply filter
- {
- XBMC->Log(LOG_ERROR, "%s - Can't add parameter to cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_CHANNELS_GETCHANNELS);
+ vrp.add_U32(radio);
+ vrp.add_U8(1); // apply filter
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -292,16 +264,10 @@ bool cVNSIData::GetChannelsList(ADDON_HANDLE handle, bool radio)
bool cVNSIData::GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t start, time_t end)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_EPG_GETFORCHANNEL))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
- if (!vrp.add_U32(channel.iUniqueId) || !vrp.add_U32(start) || !vrp.add_U32(end - start))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't add parameter to cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_EPG_GETFORCHANNEL);
+ vrp.add_U32(channel.iUniqueId);
+ vrp.add_U32(start);
+ vrp.add_U32(end - start);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -350,11 +316,7 @@ bool cVNSIData::GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel
int cVNSIData::GetTimersCount()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_TIMER_GETCOUNT))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return -1;
- }
+ vrp.init(VNSI_TIMER_GETCOUNT);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -372,14 +334,8 @@ PVR_ERROR cVNSIData::GetTimerInfo(unsigned int timernumber, PVR_TIMER &tag)
{
cRequestPacket vrp;
memset(&tag, 0, sizeof(tag));
- if (!vrp.init(VNSI_TIMER_GET))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return PVR_ERROR_UNKNOWN;
- }
-
- if (!vrp.add_U32(timernumber))
- return PVR_ERROR_UNKNOWN;
+ vrp.init(VNSI_TIMER_GET);
+ vrp.add_U32(timernumber);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -427,11 +383,7 @@ PVR_ERROR cVNSIData::GetTimerInfo(unsigned int timernumber, PVR_TIMER &tag)
bool cVNSIData::GetTimersList(ADDON_HANDLE handle)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_TIMER_GETLIST))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_TIMER_GETLIST);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -483,11 +435,7 @@ bool cVNSIData::GetTimersList(ADDON_HANDLE handle)
PVR_ERROR cVNSIData::AddTimer(const PVR_TIMER &timerinfo)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_TIMER_ADD))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return PVR_ERROR_UNKNOWN;
- }
+ vrp.init(VNSI_TIMER_ADD);
// add directory in front of the title
std::string path;
@@ -527,16 +475,16 @@ PVR_ERROR cVNSIData::AddTimer(const PVR_TIMER &timerinfo)
uint32_t starttime = timerinfo.startTime - timerinfo.iMarginStart*60;
uint32_t endtime = timerinfo.endTime + timerinfo.iMarginEnd*60;
- if (!vrp.add_U32(timerinfo.state == PVR_TIMER_STATE_SCHEDULED)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iPriority)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iLifetime)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iClientChannelUid)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(starttime)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(endtime)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iWeekdays != PVR_WEEKDAY_NONE ? timerinfo.firstDay : 0)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iWeekdays))return PVR_ERROR_UNKNOWN;
- if (!vrp.add_String(path.c_str())) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_String("")) return PVR_ERROR_UNKNOWN;
+ vrp.add_U32(timerinfo.state == PVR_TIMER_STATE_SCHEDULED);
+ vrp.add_U32(timerinfo.iPriority);
+ vrp.add_U32(timerinfo.iLifetime);
+ vrp.add_U32(timerinfo.iClientChannelUid);
+ vrp.add_U32(starttime);
+ vrp.add_U32(endtime);
+ vrp.add_U32(timerinfo.iWeekdays != PVR_WEEKDAY_NONE ? timerinfo.firstDay : 0);
+ vrp.add_U32(timerinfo.iWeekdays);
+ vrp.add_String(path.c_str());
+ vrp.add_String("");
auto vresp = ReadResult(&vrp);
if (vresp == NULL || vresp->noResponse())
@@ -558,14 +506,9 @@ PVR_ERROR cVNSIData::AddTimer(const PVR_TIMER &timerinfo)
PVR_ERROR cVNSIData::DeleteTimer(const PVR_TIMER &timerinfo, bool force)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_TIMER_DELETE))
- return PVR_ERROR_UNKNOWN;
-
- if (!vrp.add_U32(timerinfo.iClientIndex))
- return PVR_ERROR_UNKNOWN;
-
- if (!vrp.add_U32(force))
- return PVR_ERROR_UNKNOWN;
+ vrp.init(VNSI_TIMER_DELETE);
+ vrp.add_U32(timerinfo.iClientIndex);
+ vrp.add_U32(force);
auto vresp = ReadResult(&vrp);
if (vresp == NULL || vresp->noResponse())
@@ -604,18 +547,18 @@ PVR_ERROR cVNSIData::UpdateTimer(const PVR_TIMER &timerinfo)
uint32_t endtime = timerinfo.endTime + timerinfo.iMarginEnd*60;
cRequestPacket vrp;
- if (!vrp.init(VNSI_TIMER_UPDATE)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iClientIndex)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.state == PVR_TIMER_STATE_SCHEDULED)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iPriority)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iLifetime)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iClientChannelUid)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(starttime)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(endtime)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iWeekdays != PVR_WEEKDAY_NONE ? timerinfo.firstDay : 0)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_U32(timerinfo.iWeekdays))return PVR_ERROR_UNKNOWN;
- if (!vrp.add_String(timerinfo.strTitle)) return PVR_ERROR_UNKNOWN;
- if (!vrp.add_String("")) return PVR_ERROR_UNKNOWN;
+ vrp.init(VNSI_TIMER_UPDATE);
+ vrp.add_U32(timerinfo.iClientIndex);
+ vrp.add_U32(timerinfo.state == PVR_TIMER_STATE_SCHEDULED);
+ vrp.add_U32(timerinfo.iPriority);
+ vrp.add_U32(timerinfo.iLifetime);
+ vrp.add_U32(timerinfo.iClientChannelUid);
+ vrp.add_U32(starttime);
+ vrp.add_U32(endtime);
+ vrp.add_U32(timerinfo.iWeekdays != PVR_WEEKDAY_NONE ? timerinfo.firstDay : 0);
+ vrp.add_U32(timerinfo.iWeekdays);
+ vrp.add_String(timerinfo.strTitle);
+ vrp.add_String("");
auto vresp = ReadResult(&vrp);
if (vresp == NULL || vresp->noResponse())
@@ -636,11 +579,7 @@ PVR_ERROR cVNSIData::UpdateTimer(const PVR_TIMER &timerinfo)
int cVNSIData::GetRecordingsCount()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECORDINGS_GETCOUNT))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return -1;
- }
+ vrp.init(VNSI_RECORDINGS_GETCOUNT);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -656,11 +595,7 @@ int cVNSIData::GetRecordingsCount()
PVR_ERROR cVNSIData::GetRecordingsList(ADDON_HANDLE handle)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECORDINGS_GETLIST))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return PVR_ERROR_UNKNOWN;
- }
+ vrp.init(VNSI_RECORDINGS_GETLIST);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -707,20 +642,14 @@ PVR_ERROR cVNSIData::GetRecordingsList(ADDON_HANDLE handle)
PVR_ERROR cVNSIData::RenameRecording(const PVR_RECORDING& recinfo, const char* newname)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECORDINGS_RENAME))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return PVR_ERROR_UNKNOWN;
- }
+ vrp.init(VNSI_RECORDINGS_RENAME);
// add uid
XBMC->Log(LOG_DEBUG, "%s - uid: %s", __FUNCTION__, recinfo.strRecordingId);
- if (!vrp.add_U32(atoi(recinfo.strRecordingId)))
- return PVR_ERROR_UNKNOWN;
+ vrp.add_U32(atoi(recinfo.strRecordingId));
// add new title
- if (!vrp.add_String(newname))
- return PVR_ERROR_UNKNOWN;
+ vrp.add_String(newname);
auto vresp = ReadResult(&vrp);
if (vresp == NULL || vresp->noResponse())
@@ -739,14 +668,8 @@ PVR_ERROR cVNSIData::RenameRecording(const PVR_RECORDING& recinfo, const char* n
PVR_ERROR cVNSIData::DeleteRecording(const PVR_RECORDING& recinfo)
{
cRequestPacket vrp;
- if (!vrp.init(recinfo.bIsDeleted ? VNSI_RECORDINGS_DELETED_DELETE : VNSI_RECORDINGS_DELETE))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return PVR_ERROR_UNKNOWN;
- }
-
- if (!vrp.add_U32(atoi(recinfo.strRecordingId)))
- return PVR_ERROR_UNKNOWN;
+ vrp.init(recinfo.bIsDeleted ? VNSI_RECORDINGS_DELETED_DELETE : VNSI_RECORDINGS_DELETE);
+ vrp.add_U32(atoi(recinfo.strRecordingId));
auto vresp = ReadResult(&vrp);
if (vresp == NULL || vresp->noResponse())
@@ -777,14 +700,8 @@ PVR_ERROR cVNSIData::DeleteRecording(const PVR_RECORDING& recinfo)
PVR_ERROR cVNSIData::GetRecordingEdl(const PVR_RECORDING& recinfo, PVR_EDL_ENTRY edl[], int *size)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECORDINGS_GETEDL))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return PVR_ERROR_UNKNOWN;
- }
-
- if (!vrp.add_U32(atoi(recinfo.strRecordingId)))
- return PVR_ERROR_UNKNOWN;
+ vrp.init(VNSI_RECORDINGS_GETEDL);
+ vrp.add_U32(atoi(recinfo.strRecordingId));
auto vresp = ReadResult(&vrp);
if (vresp == NULL || vresp->noResponse())
@@ -808,11 +725,7 @@ PVR_ERROR cVNSIData::GetRecordingEdl(const PVR_RECORDING& recinfo, PVR_EDL_ENTRY
int cVNSIData::GetDeletedRecordingsCount()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECORDINGS_DELETED_GETCOUNT))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return -1;
- }
+ vrp.init(VNSI_RECORDINGS_DELETED_GETCOUNT);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -828,11 +741,7 @@ int cVNSIData::GetDeletedRecordingsCount()
PVR_ERROR cVNSIData::GetDeletedRecordingsList(ADDON_HANDLE handle)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECORDINGS_DELETED_GETLIST))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return PVR_ERROR_UNKNOWN;
- }
+ vrp.init(VNSI_RECORDINGS_DELETED_GETLIST);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -879,14 +788,8 @@ PVR_ERROR cVNSIData::GetDeletedRecordingsList(ADDON_HANDLE handle)
PVR_ERROR cVNSIData::UndeleteRecording(const PVR_RECORDING& recinfo)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECORDINGS_DELETED_UNDELETE))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return PVR_ERROR_UNKNOWN;
- }
-
- if (!vrp.add_U32(atoi(recinfo.strRecordingId)))
- return PVR_ERROR_UNKNOWN;
+ vrp.init(VNSI_RECORDINGS_DELETED_UNDELETE);
+ vrp.add_U32(atoi(recinfo.strRecordingId));
auto vresp = ReadResult(&vrp);
if (vresp == NULL || vresp->noResponse())
@@ -916,11 +819,7 @@ PVR_ERROR cVNSIData::UndeleteRecording(const PVR_RECORDING& recinfo)
PVR_ERROR cVNSIData::DeleteAllRecordingsFromTrash()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECORDINGS_DELETED_DELETE_ALL))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return PVR_ERROR_UNKNOWN;
- }
+ vrp.init(VNSI_RECORDINGS_DELETED_DELETE_ALL);
auto vresp = ReadResult(&vrp);
if (vresp == NULL || vresp->noResponse())
@@ -1055,16 +954,8 @@ void *cVNSIData::Process()
int cVNSIData::GetChannelGroupCount(bool automatic)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_CHANNELGROUP_GETCOUNT))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return 0;
- }
-
- if (!vrp.add_U32(automatic))
- {
- return 0;
- }
+ vrp.init(VNSI_CHANNELGROUP_GETCOUNT);
+ vrp.add_U32(automatic);
auto vresp = ReadResult(&vrp);
if (vresp == NULL || vresp->noResponse())
@@ -1080,12 +971,7 @@ int cVNSIData::GetChannelGroupCount(bool automatic)
bool cVNSIData::GetChannelGroupList(ADDON_HANDLE handle, bool bRadio)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_CHANNELGROUP_LIST))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
-
+ vrp.init(VNSI_CHANNELGROUP_LIST);
vrp.add_U8(bRadio);
auto vresp = ReadResult(&vrp);
@@ -1113,12 +999,7 @@ bool cVNSIData::GetChannelGroupList(ADDON_HANDLE handle, bool bRadio)
bool cVNSIData::GetChannelGroupMembers(ADDON_HANDLE handle, const PVR_CHANNEL_GROUP &group)
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_CHANNELGROUP_MEMBERS))
- {
- XBMC->Log(LOG_ERROR, "%s - Can't init cRequestPacket", __FUNCTION__);
- return false;
- }
-
+ vrp.init(VNSI_CHANNELGROUP_MEMBERS);
vrp.add_String(group.strGroupName);
vrp.add_U8(group.bIsRadio);
vrp.add_U8(1); // filter channels
diff --git a/src/VNSIDemux.cpp b/src/VNSIDemux.cpp
index 4ffef5e..fcfcdaa 100644
--- a/src/VNSIDemux.cpp
+++ b/src/VNSIDemux.cpp
@@ -164,13 +164,10 @@ bool cVNSIDemux::SeekTime(int time, bool backwards, double *startpts)
if (startpts)
*startpts = seek_pts;
- if (!vrp.init(VNSI_CHANNELSTREAM_SEEK) ||
- !vrp.add_S64(seek_pts) ||
- !vrp.add_U8(backwards))
- {
- XBMC->Log(LOG_ERROR, "%s - failed to seek1", __FUNCTION__);
- return false;
- }
+ vrp.init(VNSI_CHANNELSTREAM_SEEK);
+ vrp.add_S64(seek_pts);
+ vrp.add_U8(backwards);
+
auto resp = ReadResult(&vrp);
if (!resp)
{
@@ -194,12 +191,9 @@ bool cVNSIDemux::SwitchChannel(const PVR_CHANNEL &channelinfo)
XBMC->Log(LOG_DEBUG, "changing to channel %d", channelinfo.iChannelNumber);
cRequestPacket vrp1;
+ vrp1.init(VNSI_GETSETUP);
+ vrp1.add_String(CONFNAME_TIMESHIFT);
- if (!vrp1.init(VNSI_GETSETUP) || !vrp1.add_String(CONFNAME_TIMESHIFT))
- {
- XBMC->Log(LOG_ERROR, "%s - failed to get timeshift mode", __FUNCTION__);
- return false;
- }
auto resp = ReadResult(&vrp1);
if (!resp)
{
@@ -209,11 +203,12 @@ bool cVNSIDemux::SwitchChannel(const PVR_CHANNEL &channelinfo)
m_bTimeshift = resp->extract_U32();
cRequestPacket vrp2;
- if (!vrp2.init(VNSI_CHANNELSTREAM_OPEN) ||
- !vrp2.add_U32(channelinfo.iUniqueId) ||
- !vrp2.add_S32(g_iPriority) ||
- !vrp2.add_U8(1) ||
- !ReadSuccess(&vrp2))
+ vrp2.init(VNSI_CHANNELSTREAM_OPEN);
+ vrp2.add_U32(channelinfo.iUniqueId);
+ vrp2.add_S32(g_iPriority);
+ vrp2.add_U8(1);
+
+ if (!ReadSuccess(&vrp2))
{
XBMC->Log(LOG_ERROR, "%s - failed to set channel", __FUNCTION__);
return false;
diff --git a/src/VNSIRecording.cpp b/src/VNSIRecording.cpp
index 2c59c15..bdbcd87 100644
--- a/src/VNSIRecording.cpp
+++ b/src/VNSIRecording.cpp
@@ -49,11 +49,8 @@ bool cVNSIRecording::OpenRecording(const PVR_RECORDING& recinfo)
return false;
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECSTREAM_OPEN) ||
- !vrp.add_U32(atoi(recinfo.strRecordingId)))
- {
- return false;
- }
+ vrp.init(VNSI_RECSTREAM_OPEN);
+ vrp.add_U32(atoi(recinfo.strRecordingId));
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -100,12 +97,9 @@ int cVNSIRecording::Read(unsigned char* buf, uint32_t buf_size)
}
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECSTREAM_GETBLOCK) ||
- !vrp.add_U64(m_currentPlayingRecordPosition) ||
- !vrp.add_U32(buf_size))
- {
- return 0;
- }
+ vrp.init(VNSI_RECSTREAM_GETBLOCK);
+ vrp.add_U64(m_currentPlayingRecordPosition);
+ vrp.add_U32(buf_size);
auto vresp = ReadResult(&vrp);
if (!vresp)
@@ -181,8 +175,7 @@ void cVNSIRecording::OnReconnect()
void cVNSIRecording::GetLength()
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_RECSTREAM_GETLENGTH))
- return;
+ vrp.init(VNSI_RECSTREAM_GETLENGTH);
auto vresp = ReadResult(&vrp);
if (!vresp)
diff --git a/src/VNSISession.cpp b/src/VNSISession.cpp
index 7141526..dd75423 100644
--- a/src/VNSISession.cpp
+++ b/src/VNSISession.cpp
@@ -102,16 +102,16 @@ bool cVNSISession::Login()
try
{
cRequestPacket vrp;
- if (!vrp.init(VNSI_LOGIN)) throw "Can't init cRequestPacket";
- if (!vrp.add_U32(VNSI_PROTOCOLVERSION)) throw "Can't add protocol version to RequestPacket";
- if (!vrp.add_U8(false)) throw "Can't add netlog flag";
+ vrp.init(VNSI_LOGIN);
+ vrp.add_U32(VNSI_PROTOCOLVERSION);
+ vrp.add_U8(false); // netlog
if (!m_name.empty())
{
- if (!vrp.add_String(m_name.c_str())) throw "Can't add client name to RequestPacket";
+ vrp.add_String(m_name.c_str());
}
else
{
- if (!vrp.add_String("XBMC Media Center")) throw "Can't add client name to RequestPacket";
+ vrp.add_String("XBMC Media Center");
}
// read welcome
diff --git a/src/requestpacket.cpp b/src/requestpacket.cpp
index d618ecf..1a4d8fc 100644
--- a/src/requestpacket.cpp
+++ b/src/requestpacket.cpp
@@ -45,7 +45,7 @@ cRequestPacket::~cRequestPacket()
free(buffer);
}
-bool cRequestPacket::init(uint32_t topcode, bool stream, bool setUserDataLength, size_t userDataLength)
+void cRequestPacket::init(uint32_t topcode, bool stream, bool setUserDataLength, size_t userDataLength)
{
assert(buffer == NULL);
@@ -80,14 +80,12 @@ bool cRequestPacket::init(uint32_t topcode, bool stream, bool setUserDataLength,
ul = htonl(userDataLength);
memcpy(&buffer[userDataLenPos], &ul, sizeof(uint32_t));
bufUsed = headerLength;
-
- return true;
}
-bool cRequestPacket::add_String(const char* string)
+void cRequestPacket::add_String(const char* string)
{
size_t len = strlen(string) + 1;
- if (!checkExtend(len)) return false;
+ checkExtend(len);
memcpy(buffer + bufUsed, string, len);
bufUsed += len;
if (!lengthSet)
@@ -95,12 +93,11 @@ bool cRequestPacket::add_String(const char* string)
uint32_t tmp = htonl(bufUsed - headerLength);
memcpy(&buffer[userDataLenPos], &tmp, sizeof(uint32_t));
}
- return true;
}
-bool cRequestPacket::add_U8(uint8_t c)
+void cRequestPacket::add_U8(uint8_t c)
{
- if (!checkExtend(sizeof(uint8_t))) return false;
+ checkExtend(sizeof(uint8_t));
buffer[bufUsed] = c;
bufUsed += sizeof(uint8_t);
if (!lengthSet)
@@ -108,12 +105,11 @@ bool cRequestPacket::add_U8(uint8_t c)
uint32_t tmp = htonl(bufUsed - headerLength);
memcpy(&buffer[userDataLenPos], &tmp, sizeof(uint32_t));
}
- return true;
}
-bool cRequestPacket::add_S32(int32_t l)
+void cRequestPacket::add_S32(int32_t l)
{
- if (!checkExtend(sizeof(int32_t))) return false;
+ checkExtend(sizeof(int32_t));
int32_t tmp = htonl(l);
memcpy(&buffer[bufUsed], &tmp, sizeof(int32_t));
bufUsed += sizeof(int32_t);
@@ -122,12 +118,11 @@ bool cRequestPacket::add_S32(int32_t l)
uint32_t tmp = htonl(bufUsed - headerLength);
memcpy(&buffer[userDataLenPos], &tmp, sizeof(uint32_t));
}
- return true;
}
-bool cRequestPacket::add_U32(uint32_t ul)
+void cRequestPacket::add_U32(uint32_t ul)
{
- if (!checkExtend(sizeof(uint32_t))) return false;
+ checkExtend(sizeof(uint32_t));
uint32_t tmp = htonl(ul);
memcpy(&buffer[bufUsed], &tmp, sizeof(uint32_t));
bufUsed += sizeof(uint32_t);
@@ -136,12 +131,11 @@ bool cRequestPacket::add_U32(uint32_t ul)
uint32_t tmp = htonl(bufUsed - headerLength);
memcpy(&buffer[userDataLenPos], &tmp, sizeof(uint32_t));
}
- return true;
}
-bool cRequestPacket::add_U64(uint64_t ull)
+void cRequestPacket::add_U64(uint64_t ull)
{
- if (!checkExtend(sizeof(uint64_t))) return false;
+ checkExtend(sizeof(uint64_t));
uint64_t tmp = htonll(ull);
memcpy(&buffer[bufUsed], &tmp, sizeof(uint64_t));
bufUsed += sizeof(uint64_t);
@@ -150,12 +144,11 @@ bool cRequestPacket::add_U64(uint64_t ull)
uint32_t tmp = htonl(bufUsed - headerLength);
memcpy(&buffer[userDataLenPos], &tmp, sizeof(uint32_t));
}
- return true;
}
-bool cRequestPacket::add_S64(int64_t ll)
+void cRequestPacket::add_S64(int64_t ll)
{
- if (!checkExtend(sizeof(int64_t))) return false;
+ checkExtend(sizeof(int64_t));
int64_t tmp = htonll(ll);
memcpy(&buffer[bufUsed], &tmp, sizeof(int64_t));
bufUsed += sizeof(int64_t);
@@ -164,13 +157,12 @@ bool cRequestPacket::add_S64(int64_t ll)
uint32_t tmp = htonl(bufUsed - headerLength);
memcpy(&buffer[userDataLenPos], &tmp, sizeof(uint32_t));
}
- return true;
}
-bool cRequestPacket::checkExtend(size_t by)
+void cRequestPacket::checkExtend(size_t by)
{
- if (lengthSet) return true;
- if ((bufUsed + by) <= bufSize) return true;
+ if (lengthSet) return;
+ if ((bufUsed + by) <= bufSize) return;
uint8_t* newBuf = (uint8_t*)realloc(buffer, bufUsed + by);
if (!newBuf)
{
@@ -183,6 +175,5 @@ bool cRequestPacket::checkExtend(size_t by)
}
buffer = newBuf;
bufSize = bufUsed + by;
- return true;
}
diff --git a/src/requestpacket.h b/src/requestpacket.h
index 7dbb229..0ecc8c2 100644
--- a/src/requestpacket.h
+++ b/src/requestpacket.h
@@ -29,13 +29,13 @@ class cRequestPacket
cRequestPacket();
~cRequestPacket();
- bool init(uint32_t opcode, bool stream = false, bool setUserDataLength = false, size_t userDataLength = 0);
- bool add_String(const char* string);
- bool add_U8(uint8_t c);
- bool add_U32(uint32_t ul);
- bool add_S32(int32_t l);
- bool add_U64(uint64_t ull);
- bool add_S64(int64_t ll);
+ void init(uint32_t opcode, bool stream = false, bool setUserDataLength = false, size_t userDataLength = 0);
+ void add_String(const char* string);
+ void add_U8(uint8_t c);
+ void add_U32(uint32_t ul);
+ void add_S32(int32_t l);
+ void add_U64(uint64_t ull);
+ void add_S64(int64_t ll);
uint8_t* getPtr() const { return buffer; }
size_t getLen() const { return bufUsed; }
@@ -57,7 +57,7 @@ class cRequestPacket
uint32_t opcode;
- bool checkExtend(size_t by);
+ void checkExtend(size_t by);
constexpr static size_t headerLength = 16;
constexpr static size_t userDataLenPos = 12;
--
kodi-pvr-vdr-vnsi packaging
More information about the pkg-multimedia-commits
mailing list