Skip to content

Commit

Permalink
Merge pull request #25159 from ksooo/pvr-instance-name-cleanup
Browse files Browse the repository at this point in the history 
[Estuary][guilib][PVR] Cleanup and Fixes after #24182
  • Loading branch information
@ksooo
ksooo committed May 10, 2024
2 parents adad147 + 638d47d commit 64e0ecf
Show file tree
Hide file tree
Showing 20 changed files with 110 additions and 93 deletions.
2 changes: 1 addition & 1 deletion addons/skin.estuary/xml/DialogPVRInfo.xml
View file
Expand Up @@ -49,7 +49,7 @@
<width>1050</width>
<height>425</height>
<align>justify</align>
<label>$INFO[ListItem.ChannelName,[B],[/B][CR]]$INFO[ListItem.Date,[COLOR grey]$LOCALIZE[552]:[/COLOR] ,[CR]]$INFO[ListItem.Duration,[COLOR grey]$LOCALIZE[180]:[/COLOR] ,[CR]]$VAR[RecordingSizeLabel]$VAR[PremieredLabel]$INFO[ListItem.Rating,[COLOR grey]$LOCALIZE[563]:[/COLOR] ,[CR]]$VAR[ExpirationDateTimeLabel]$VAR[PVRInstanceName]$INFO[ListItem.Genre,[COLOR grey]$LOCALIZE[515]: [/COLOR]][CR]$INFO[ListItem.ParentalRatingCode,[COLOR grey]$LOCALIZE[31017]: [/COLOR],[CR]]$INFO[ListItem.Writer,[COLOR grey]$LOCALIZE[20417]:[/COLOR] ,[CR]]$INFO[ListItem.Director,[COLOR grey]$LOCALIZE[20339]:[/COLOR] ,[CR]]$INFO[ListItem.Cast,[COLOR grey]$LOCALIZE[206]:[/COLOR] ,[CR]][CR]$INFO[ListItem.Plot]</label>
<label>$INFO[ListItem.ChannelName,[B],[/B][CR]]$INFO[ListItem.Date,[COLOR grey]$LOCALIZE[552]:[/COLOR] ,[CR]]$INFO[ListItem.Duration,[COLOR grey]$LOCALIZE[180]:[/COLOR] ,[CR]]$VAR[RecordingSizeLabel]$VAR[PremieredLabel]$INFO[ListItem.Rating,[COLOR grey]$LOCALIZE[563]:[/COLOR] ,[CR]]$VAR[ExpirationDateTimeLabel]$VAR[PVRInstanceName,,[CR]]$INFO[ListItem.Genre,[COLOR grey]$LOCALIZE[515]: [/COLOR]][CR]$INFO[ListItem.ParentalRatingCode,[COLOR grey]$LOCALIZE[31017]: [/COLOR],[CR]]$INFO[ListItem.Writer,[COLOR grey]$LOCALIZE[20417]:[/COLOR] ,[CR]]$INFO[ListItem.Director,[COLOR grey]$LOCALIZE[20339]:[/COLOR] ,[CR]]$INFO[ListItem.Cast,[COLOR grey]$LOCALIZE[206]:[/COLOR] ,[CR]][CR]$INFO[ListItem.Plot]</label>
<autoscroll time="3000" delay="4000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
</control>
<control type="grouplist" id="9000">
Expand Down
4 changes: 2 additions & 2 deletions addons/skin.estuary/xml/Includes_PVR.xml
View file
Expand Up @@ -440,7 +440,7 @@
<top>465</top>
<width>830</width>
<bottom>list_bottom_offset</bottom>
<label>$VAR[PVRInstanceName]$VAR[FlagLabel,,[CR]]$INFO[ListItem.Genre,[COLOR grey]$LOCALIZE[515]:[/COLOR] ,[CR]]$INFO[ListItem.ParentalRatingCode,[COLOR grey]$LOCALIZE[31017]: [/COLOR],[CR]]$INFO[ListItem.TimerType,[COLOR grey]$LOCALIZE[803]:[/COLOR] ,[CR]]$VAR[RecordingSizeLabel]$VAR[ExpirationDateTimeLabel]$INFO[ListItem.Plot,[CR]]</label>
<label>$VAR[PVRInstanceName,,[CR]]$VAR[FlagLabel,,[CR]]$INFO[ListItem.Genre,[COLOR grey]$LOCALIZE[515]:[/COLOR] ,[CR]]$INFO[ListItem.ParentalRatingCode,[COLOR grey]$LOCALIZE[31017]: [/COLOR],[CR]]$INFO[ListItem.TimerType,[COLOR grey]$LOCALIZE[803]:[/COLOR] ,[CR]]$VAR[RecordingSizeLabel]$VAR[ExpirationDateTimeLabel]$INFO[ListItem.Plot,[CR]]</label>
<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(AutoScroll)</autoscroll>
</control>
</control>
Expand All @@ -451,7 +451,7 @@
<top>10</top>
<width>830</width>
<height>262</height>
<label>$LOCALIZE[19076] ($INFO[Container(5000).NumItems,[B],[/B] $LOCALIZE[31036]]) $INFO[ListItem.Property(recordingsize),- $LOCALIZE[20161]: [B],[/B]] $VAR[PVRInstanceName]</label>
<label>$LOCALIZE[19076] ($INFO[Container(5000).NumItems,[B],[/B] $LOCALIZE[31036]]) $INFO[ListItem.Property(recordingsize),- $LOCALIZE[20161]: [B],[/B]]</label>
<font>font37</font>
<visible>!ListItem.IsParentFolder</visible>
</control>
Expand Down
2 changes: 1 addition & 1 deletion addons/skin.estuary/xml/Variables.xml
View file
Expand Up @@ -799,6 +799,6 @@
<value>$INFO[ListItem.Duration,$LOCALIZE[180]: ][CR]$VAR[VideoCodecVar,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$VAR[VideoHDRVar,| , ]$INFO[ListItem.VideoAspect,| ,:1 ]$VAR[AudioCodecVar,| , ]$VAR[AudioChannelsVar]</value>
</variable>
<variable name="PVRInstanceName">
<value condition="Integer.IsGreater(System.PVRCount,1)">$INFO[ListItem.BackendInstanceName,[COLOR grey]$LOCALIZE[31137]:[/COLOR] ,[CR]]</value>
<value condition="Integer.IsGreater(PVR.ClientCount,1)">$INFO[ListItem.PVRClientName,[COLOR grey]$LOCALIZE[31137]:[/COLOR] ,]$INFO[ListItem.PVRInstanceName, (,)]</value>
</variable>
</includes>
55 changes: 34 additions & 21 deletions xbmc/GUIInfoManager.cpp
View file
Expand Up @@ -1334,15 +1334,6 @@ const infomap weather[] = {{ "isfetched", WEATHER_IS_FETCHED },
/// @skinning_v17 **[New Boolean Condition]** \link System_HasPVRAddon
/// `System.HasPVRAddon`\endlink <p>
/// }
/// \table_row3{ <b>`System.PVRCount`</b>,
/// \anchor System_PVRCount
/// _integer_,
/// @return Number of PVR clients enabled.
/// @note If a PVR is enabled but unreachable\, it is still counted.
/// <p><hr>
/// @skinning_v22 **[New Integer Value]** \link System_PVRCount `System.PVRCount`\endlink
/// <p>
/// }
/// \table_row3{ <b>`System.HasCMS`</b>,
/// \anchor System_HasCMS
/// _boolean_,
Expand Down Expand Up @@ -1984,7 +1975,6 @@ const infomap system_labels[] = {
{"hascms", SYSTEM_HAS_CMS},
{"privacypolicy", SYSTEM_PRIVACY_POLICY},
{"haspvraddon", SYSTEM_HAS_PVR_ADDON},
{"pvrcount", SYSTEM_PVR_COUNT},
{"addonupdatecount", SYSTEM_ADDON_UPDATE_COUNT},
{"supportscpuusage", SYSTEM_SUPPORTS_CPU_USAGE},
{"supportedhdrtypes", SYSTEM_SUPPORTED_HDR_TYPES},
Expand Down Expand Up @@ -6928,14 +6918,6 @@ const infomap container_str[] = {{ "property", CONTAINER_PROPERTY },
/// <p><hr>
/// @skinning_v21 **[New Infolabel]** \link ListItem_SongVideoURL `ListItem.SongVideoURL`\endlink
/// }
/// \table_row3{ <b>`ListItem.BackendInstanceName`</b>,
/// \anchor ListItem_BackendInstanceName
/// _string_,
/// @return The name used by the PVR client addon instance for the selected item.
/// <p><hr>
/// @skinning_v22 **[New Infolabel]** \link ListItem_BackendInstanceName `ListItem.BackendInstanceName`\endlink
/// <p>
/// }
/// \table_row3{ <b>`ListItem.VideoWidth`</b>,
/// \anchor ListItem_VideoWidth
/// _string_,
Expand Down Expand Up @@ -6978,6 +6960,25 @@ const infomap container_str[] = {{ "property", CONTAINER_PROPERTY },
/// <p><hr>
/// @skinning_v21 **[New Infolabel]** \link ListItem_HasVideoExtras `ListItem.HasVideoExtras`\endlink
/// }
/// \table_row3{ <b>`ListItem.PVRClientName`</b>,
/// \anchor ListItem_PVRClientName
/// _string_,
/// @return If selected item is of type PVR (recording, timer, EPG), the name of the PVR client
/// add-on, as specified by the add-on developer. Empty if theitem is not of type PVR.
/// <p><hr>
/// @skinning_v22 **[New Infolabel]** \link ListItem_PVRClientName `ListItem.PVRClientName`\endlink
/// <p>
/// }
/// \table_row3{ <b>`ListItem.PVRInstanceName`</b>,
/// \anchor ListItem_PVRInstanceName
/// _string_,
/// @return If selected item is of type PVR (recording, timer, EPG), the name of the instance
/// of the PVR client add-on, as specified by the user in the add-on settings. Empty if the
/// PVR client add-on does not support multiple instances or item is not of type PVR.
/// <p><hr>
/// @skinning_v22 **[New Infolabel]** \link ListItem_PVRInstanceName `ListItem.PVRInstanceName`\endlink
/// <p>
/// }
/// \table_end
///
/// -----------------------------------------------------------------------------
Expand Down Expand Up @@ -7199,7 +7200,8 @@ const infomap listitem_labels[]= {{ "thumb", LISTITEM_THUMB },
{ "isvideoextra", LISTITEM_ISVIDEOEXTRA },
{ "videoversionname", LISTITEM_VIDEOVERSION_NAME },
{ "hasvideoextras", LISTITEM_HASVIDEOEXTRAS },
{ "backendinstancename", LISTITEM_BACKEND_INSTANCE_NAME },
{ "pvrclientname", LISTITEM_PVR_CLIENT_NAME },
{ "pvrinstancename", LISTITEM_PVR_INSTANCE_NAME },
};
// clang-format on

Expand Down Expand Up @@ -8208,10 +8210,20 @@ const infomap playlist[] = {{ "length", PLAYLIST_LENGTH },
/// _string_,
/// @return The icon of the currently playing epg event\, if any.
/// <p><hr>
/// @skinning_v18 **[New Infolabel]** \link PVR_EpgEventIcon `PVR_EpgEventIcon`\endlink
/// @skinning_v18 **[New Infolabel]** \link PVR_EpgEventIcon `PVR.EpgEventIcon`\endlink
/// <p>
/// }
/// \table_row3{ <b>`PVR.ClientCount`</b>,
/// \anchor PVR_ClientCount
/// _integer_,
/// @return Number of PVR clients enabled.
/// <p><hr>
/// @skinning_v22 **[New Integer Value]** \link PVR_ClientCount `PVR.ClientCount`\endlink
/// <p>
/// }
/// \table_end
///
/// -----------------------------------------------------------------------------
// clang-format off
const infomap pvr[] = {{ "isrecording", PVR_IS_RECORDING },
{ "hastimer", PVR_HAS_TIMER },
Expand Down Expand Up @@ -8291,7 +8303,8 @@ const infomap pvr[] = {{ "isrecording", PVR_IS_RECORDING
{ "timeshiftprogressepgend", PVR_TIMESHIFT_PROGRESS_EPG_END },
{ "timeshiftprogressbufferstart", PVR_TIMESHIFT_PROGRESS_BUFFER_START },
{ "timeshiftprogressbufferend", PVR_TIMESHIFT_PROGRESS_BUFFER_END },
{ "epgeventicon", PVR_EPG_EVENT_ICON }};
{ "epgeventicon", PVR_EPG_EVENT_ICON },
{ "clientcount", PVR_CLIENT_COUNT }};
// clang-format on

/// \page modules__infolabels_boolean_conditions
Expand Down
9 changes: 5 additions & 4 deletions xbmc/guilib/guiinfo/GUIInfoLabels.h
View file
Expand Up @@ -486,7 +486,6 @@
#define SYSTEM_PLATFORM_DARWIN_TVOS 755
#define SYSTEM_SUPPORTED_HDR_TYPES 756
#define SYSTEM_PLATFORM_WEBOS 757
#define SYSTEM_PVR_COUNT 758

#define SLIDESHOW_ISPAUSED 800
#define SLIDESHOW_ISRANDOM 801
Expand Down Expand Up @@ -594,7 +593,6 @@ static constexpr unsigned int SYSTEM_LOCALE = 1012;
#define PVR_CAN_RECORD_PLAYING_CHANNEL (PVR_CONDITIONS_START + 17)
#define PVR_IS_RECORDING_PLAYING_CHANNEL (PVR_CONDITIONS_START + 18)
#define PVR_IS_PLAYING_ACTIVE_RECORDING (PVR_CONDITIONS_START + 19)
#define PVR_CONDITIONS_END PVR_IS_PLAYING_ACTIVE_RECORDING

#define PVR_STRINGS_START 1200
#define PVR_NEXT_RECORDING_CHANNEL (PVR_STRINGS_START)
Expand Down Expand Up @@ -670,7 +668,9 @@ static constexpr unsigned int SYSTEM_LOCALE = 1012;
#define PVR_TIMESHIFT_SEEKBAR (PVR_STRINGS_START + 73)
#define PVR_BACKEND_PROVIDERS (PVR_STRINGS_START + 74)
#define PVR_BACKEND_CHANNEL_GROUPS (PVR_STRINGS_START + 75)
#define PVR_STRINGS_END PVR_BACKEND_CHANNEL_GROUPS

#define PVR_INTS_START 1300
#define PVR_CLIENT_COUNT (PVR_INTS_START)

#define RDS_DATA_START 1400
#define RDS_HAS_RDS (RDS_DATA_START)
Expand Down Expand Up @@ -979,7 +979,8 @@ static constexpr unsigned int SYSTEM_LOCALE = 1012;
#define LISTITEM_ISVIDEOEXTRA (LISTITEM_START + 214)
#define LISTITEM_VIDEOVERSION_NAME (LISTITEM_START + 215)
#define LISTITEM_HASVIDEOEXTRAS (LISTITEM_START + 216)
#define LISTITEM_BACKEND_INSTANCE_NAME (LISTITEM_START + 217)
#define LISTITEM_PVR_CLIENT_NAME (LISTITEM_START + 217)
#define LISTITEM_PVR_INSTANCE_NAME (LISTITEM_START + 218)

#define LISTITEM_END (LISTITEM_START + 2500)

Expand Down
13 changes: 0 additions & 13 deletions xbmc/guilib/guiinfo/SystemGUIInfo.cpp
View file
Expand Up @@ -26,8 +26,6 @@
#include "guilib/guiinfo/GUIInfoLabels.h"
#include "powermanagement/PowerManager.h"
#include "profiles/ProfileManager.h"
#include "pvr/PVRManager.h"
#include "pvr/addons/PVRClients.h"
#include "settings/AdvancedSettings.h"
#include "settings/MediaSettings.h"
#include "settings/SettingUtils.h"
Expand Down Expand Up @@ -341,12 +339,6 @@ bool CSystemGUIInfo::GetLabel(std::string& value, const CFileItem *item, int con
value = g_langInfo.GetRegionLocale();
return true;
}

case SYSTEM_PVR_COUNT:
{
value = std::to_string(CServiceBroker::GetPVRManager().Clients()->EnabledClientAmount());
return true;
}
}
return false;
}
Expand Down Expand Up @@ -382,11 +374,6 @@ bool CSystemGUIInfo::GetInt(int& value, const CGUIListItem *gitem, int contextWi
case SYSTEM_BATTERY_LEVEL:
value = CServiceBroker::GetPowerManager().BatteryLevel();
return true;
case SYSTEM_PVR_COUNT:
{
value = CServiceBroker::GetPVRManager().Clients()->EnabledClientAmount();
return true;
}
}

return false;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/pvr/PVRPlaybackState.cpp
View file
Expand Up @@ -222,7 +222,7 @@ void CPVRPlaybackState::OnPlaybackStarted(const CFileItem& item)
const std::shared_ptr<const CPVRClient> client =
CServiceBroker::GetPVRManager().GetClient(m_playingClientId);
if (client)
m_strPlayingClientName = client->GetFriendlyName();
m_strPlayingClientName = client->GetFullClientName();
}
}

Expand Down
28 changes: 15 additions & 13 deletions xbmc/pvr/addons/PVRClient.cpp
View file
Expand Up @@ -408,28 +408,30 @@ const std::string& CPVRClient::GetConnectionString() const
return m_strConnectionString;
}

const std::string CPVRClient::GetFriendlyName() const
std::string CPVRClient::GetClientName() const
{
return Name();
}

std::string CPVRClient::GetInstanceName() const
{
std::string instanceName;
if (Addon()->SupportsInstanceSettings())
{
std::string instanceName;
Addon()->GetSettingString(ADDON_SETTING_INSTANCE_NAME_VALUE, instanceName, InstanceId());
if (!instanceName.empty())
return StringUtils::Format("{} ({})", Name(), instanceName);
}
return Name();

return instanceName;
}

std::string CPVRClient::GetInstanceName() const
std::string CPVRClient::GetFullClientName() const
{
if (Addon()->SupportsInstanceSettings())
{
std::string instanceName;
Addon()->GetSettingString(ADDON_SETTING_INSTANCE_NAME_VALUE, instanceName, InstanceId());
return instanceName;
if (!instanceName.empty())
return StringUtils::Format("{} ({})", Name(), instanceName);
}
return "";
return Name();
}

PVR_ERROR CPVRClient::GetDriveSpace(uint64_t& iTotal, uint64_t& iUsed) const
Expand Down Expand Up @@ -1032,7 +1034,7 @@ PVR_ERROR CPVRClient::UpdateTimerTypes()
CLog::LogF(LOGWARNING,
"Add-on {} does not support timer types. It will work, but not benefit from "
"the timer features introduced with PVR Addon API 2.0.0",
GetFriendlyName());
Name());

// Create standard timer types (mostly) matching the timer functionality available in Isengard.
// This is for migration only and does not make changes to the addons obsolete. Addons should
Expand Down Expand Up @@ -1859,7 +1861,7 @@ void CPVRClient::cb_recording_notification(void* kodiInstance,
}

const std::string strLine1 = StringUtils::Format(g_localizeStrings.Get(bOnOff ? 19197 : 19198),
client->GetFriendlyName());
client->GetFullClientName());
std::string strLine2;
if (strName)
strLine2 = strName;
Expand All @@ -1872,7 +1874,7 @@ void CPVRClient::cb_recording_notification(void* kodiInstance,
auto eventLog = CServiceBroker::GetEventLog();
if (eventLog)
eventLog->Add(EventPtr(
new CNotificationEvent(client->GetFriendlyName(), strLine1, client->Icon(), strLine2)));
new CNotificationEvent(client->GetFullClientName(), strLine1, client->Icon(), strLine2)));

CLog::LogFC(LOGDEBUG, LOGPVR, "Recording {} on client {}. name='{}' filename='{}'",
bOnOff ? "started" : "finished", client->GetID(), strName, strFileName);
Expand Down
14 changes: 11 additions & 3 deletions xbmc/pvr/addons/PVRClient.h
View file
Expand Up @@ -164,17 +164,25 @@ class CPVRClient : public ADDON::IAddonInstanceHandler
const std::string& GetConnectionString() const;

/*!
* @brief A friendly name used to uniquely identify the addon instance
* @brief The name of the PVR client, as specified by the addon developer.
* @return string that can be used in log messages and the GUI.
*/
const std::string GetFriendlyName() const;
std::string GetClientName() const;

/*!
* @brief The name used by the PVR client addon instance
* @brief The name of the PVR client addon instance, as specified by the user in the addon
* settings. Empty if addon does not support multiple instances.
* @return string that can be used in log messages and the GUI.
*/
std::string GetInstanceName() const;

/*!
* @brief A name used to uniquely identify the client, inclusing addon name and instance
* name, if multiple instances are supported by the client implementation.
* @return string that can be used in log messages and the GUI.
*/
std::string GetFullClientName() const;

/*!
* @brief Get the disk space reported by the server.
* @param iTotal The total disk space.
Expand Down
2 changes: 1 addition & 1 deletion xbmc/pvr/addons/PVRClients.cpp
View file
Expand Up @@ -885,7 +885,7 @@ void CPVRClients::ConnectionStateChange(CPVRClient* client,

// Notify user.
CServiceBroker::GetJobManager()->AddJob(
new CPVREventLogJob(bNotify, eLevel, client->GetFriendlyName(), strMsg, client->Icon()),
new CPVREventLogJob(bNotify, eLevel, client->GetFullClientName(), strMsg, client->Icon()),
nullptr);
}

Expand Down
2 changes: 1 addition & 1 deletion xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
View file
Expand Up @@ -840,7 +840,7 @@ void CGUIDialogPVRChannelManager::Update()
CServiceBroker::GetPVRManager().GetClient(*channelFile);
if (client)
{
channelFile->SetProperty(PROPERTY_CLIENT_NAME, client->GetFriendlyName());
channelFile->SetProperty(PROPERTY_CLIENT_NAME, client->GetFullClientName());
channelFile->SetProperty(PROPERTY_CLIENT_SUPPORTS_SETTINGS,
client->GetClientCapabilities().SupportsChannelSettings());
}
Expand Down
2 changes: 1 addition & 1 deletion xbmc/pvr/dialogs/GUIDialogPVRClientPriorities.cpp
View file
Expand Up @@ -43,7 +43,7 @@ std::string CGUIDialogPVRClientPriorities::GetSettingsLabel(
int iClientId = std::atoi(pSetting->GetId().c_str());
auto clientEntry = m_clients.find(iClientId);
if (clientEntry != m_clients.end())
return clientEntry->second->GetFriendlyName();
return clientEntry->second->GetFullClientName();

CLog::LogF(LOGERROR, "Unable to obtain pvr client with id '{}'", iClientId);
return CGUIDialogSettingsManualBase::GetLocalizedString(13205); // Unknown
Expand Down
2 changes: 1 addition & 1 deletion xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
View file
Expand Up @@ -585,7 +585,7 @@ void CGUIDialogPVRGroupManager::Update()
const std::shared_ptr<const CPVRClient> client =
CServiceBroker::GetPVRManager().GetClient(*group);
if (client)
group->SetProperty(PROPERTY_CLIENT_NAME, client->GetFriendlyName());
group->SetProperty(PROPERTY_CLIENT_NAME, client->GetFullClientName());
}

// Load group thumbnails
Expand Down
2 changes: 1 addition & 1 deletion xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp
View file
Expand Up @@ -935,7 +935,7 @@ void CGUIDialogPVRTimerSettings::TypesFiller(const SettingConstPtr& setting,

const auto client = clients->GetCreatedClient(typeEntry.second->GetClientId());
if (client)
clientName = client->GetFriendlyName();
clientName = client->GetFullClientName();

list.emplace_back(typeEntry.second->GetDescription(), clientName, typeEntry.first,
typeEntry.second->IsReminder() ? reminderTimerProps : recordingTimerProps);
Expand Down
4 changes: 2 additions & 2 deletions xbmc/pvr/guilib/PVRGUIActionsChannels.cpp
View file
Expand Up @@ -282,7 +282,7 @@ bool CPVRGUIActionsChannels::StartChannelScan(int clientId)
pDialog->SetHeading(CVariant{19119}); // "On which backend do you want to search?"

for (const auto& client : possibleScanClients)
pDialog->Add(client->GetFriendlyName());
pDialog->Add(client->GetFullClientName());

pDialog->Open();

Expand All @@ -307,7 +307,7 @@ bool CPVRGUIActionsChannels::StartChannelScan(int clientId)

/* start the channel scan */
CLog::LogFC(LOGDEBUG, LOGPVR, "Starting to scan for channels on client {}",
scanClient->GetFriendlyName());
scanClient->GetFullClientName());
auto start = std::chrono::steady_clock::now();

/* do the scan */
Expand Down
2 changes: 1 addition & 1 deletion xbmc/pvr/guilib/PVRGUIActionsClients.cpp
View file
Expand Up @@ -73,7 +73,7 @@ bool CPVRGUIActionsClients::ProcessSettingsMenuHooks()
if (clients.size() == 1)
pDialog->Add(hook.second.GetLabel());
else
pDialog->Add(hook.first->GetFriendlyName() + ": " + hook.second.GetLabel());
pDialog->Add(hook.first->GetFullClientName() + ": " + hook.second.GetLabel());
}

pDialog->Open();
Expand Down
2 changes: 1 addition & 1 deletion xbmc/pvr/guilib/PVRGUIActionsTimers.cpp
View file
Expand Up @@ -831,7 +831,7 @@ void AddEventLogEntry(const std::shared_ptr<const CPVRTimerInfoTag>& timer, int
CServiceBroker::GetPVRManager().GetClient(timer->GetTimerType()->GetClientId());
if (client)
{
name = client->GetFriendlyName();
name = client->GetFullClientName();
icon = client->Icon();
}
else
Expand Down

0 comments on commit 64e0ecf

Please sign in to comment.