Skip to content

Commit

Permalink
[refactor] use generic GetWindow() or GetDialog()
Browse files Browse the repository at this point in the history
  • Loading branch information
@xhaggi
xhaggi committed Mar 21, 2017
1 parent 686371f commit 6af40c2
Show file tree
Hide file tree
Showing 90 changed files with 242 additions and 244 deletions.
12 changes: 6 additions & 6 deletions xbmc/Application.cpp
View file
Expand Up @@ -1725,7 +1725,7 @@ bool CApplication::LoadSkin(const std::string& skinID)
g_windowManager.ActivateWindow(currentWindow);
for (unsigned int i = 0; i < currentModelessWindows.size(); i++)
{
CGUIDialog *dialog = (CGUIDialog *)g_windowManager.GetWindow(currentModelessWindows[i]);
CGUIDialog *dialog = g_windowManager.GetDialog(currentModelessWindows[i]);
if (dialog)
dialog->Open();
}
Expand Down Expand Up @@ -2554,7 +2554,7 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)

case TMSG_PICTURE_SHOW:
{
CGUIWindowSlideShow *pSlideShow = static_cast<CGUIWindowSlideShow *>(g_windowManager.GetWindow(WINDOW_SLIDESHOW));
CGUIWindowSlideShow *pSlideShow = g_windowManager.GetWindow<CGUIWindowSlideShow>();
if (!pSlideShow) return;

// stop playing file
Expand Down Expand Up @@ -2603,7 +2603,7 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)

case TMSG_PICTURE_SLIDESHOW:
{
CGUIWindowSlideShow *pSlideShow = static_cast<CGUIWindowSlideShow *>(g_windowManager.GetWindow(WINDOW_SLIDESHOW));
CGUIWindowSlideShow *pSlideShow = g_windowManager.GetWindow<CGUIWindowSlideShow>();
if (!pSlideShow) return;

if (g_application.m_pPlayer->IsPlayingVideo())
Expand Down Expand Up @@ -2712,7 +2712,7 @@ void CApplication::FrameMove(bool processEvents, bool processGUI)
{
g_graphicsContext.Lock();
// check if there are notifications to display
CGUIDialogKaiToast *toast = (CGUIDialogKaiToast *)g_windowManager.GetWindow(WINDOW_DIALOG_KAI_TOAST);
CGUIDialogKaiToast *toast = g_windowManager.GetWindow<CGUIDialogKaiToast>();
if (toast && toast->DoWork())
{
if (!toast->IsDialogRunning())
Expand Down Expand Up @@ -4709,7 +4709,7 @@ CFileItem& CApplication::CurrentUnstackedItem()

void CApplication::ShowVolumeBar(const CAction *action)
{
CGUIDialog *volumeBar = (CGUIDialog *)g_windowManager.GetWindow(WINDOW_DIALOG_VOLUME_BAR);
CGUIDialog *volumeBar = g_windowManager.GetDialog(WINDOW_DIALOG_VOLUME_BAR);
if (volumeBar)
{
volumeBar->Open();
Expand Down Expand Up @@ -4975,7 +4975,7 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */)
// if playing from the video info window, close it first!
if (g_windowManager.HasModalDialog() && g_windowManager.GetTopMostModalDialogID() == WINDOW_DIALOG_VIDEO_INFO)
{
CGUIDialogVideoInfo* pDialog = (CGUIDialogVideoInfo*)g_windowManager.GetWindow(WINDOW_DIALOG_VIDEO_INFO);
CGUIDialogVideoInfo* pDialog = g_windowManager.GetWindow<CGUIDialogVideoInfo>();
if (pDialog) pDialog->Close(true);
}

Expand Down
18 changes: 9 additions & 9 deletions xbmc/GUIInfoManager.cpp
View file
Expand Up @@ -6802,7 +6802,7 @@ bool CGUIInfoManager::GetInt(int &value, int info, int contextWindow, const CGUI
}
case SYSTEM_PROGRESS_BAR:
{
CGUIDialogProgress *bar = (CGUIDialogProgress *)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
CGUIDialogProgress *bar = g_windowManager.GetWindow<CGUIDialogProgress>();
if (bar && bar->IsDialogRunning())
value = bar->GetPercentage();
return true;
Expand Down Expand Up @@ -7046,8 +7046,8 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI
}
else if (condition == SYSTEM_HAS_INPUT_HIDDEN)
{
CGUIDialogNumeric *pNumeric = (CGUIDialogNumeric *)g_windowManager.GetWindow(WINDOW_DIALOG_NUMERIC);
CGUIDialogKeyboardGeneric *pKeyboard = (CGUIDialogKeyboardGeneric*)g_windowManager.GetWindow(WINDOW_DIALOG_KEYBOARD);
CGUIDialogNumeric *pNumeric = g_windowManager.GetWindow<CGUIDialogNumeric>();
CGUIDialogKeyboardGeneric *pKeyboard = g_windowManager.GetWindow<CGUIDialogKeyboardGeneric>();

if (pNumeric && pNumeric->IsActive())
bReturn = pNumeric->IsInputHidden();
Expand Down Expand Up @@ -7136,22 +7136,22 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI
}
else if (condition == SLIDESHOW_ISPAUSED)
{
CGUIWindowSlideShow *slideShow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
CGUIWindowSlideShow *slideShow = g_windowManager.GetWindow<CGUIWindowSlideShow>();
bReturn = (slideShow && slideShow->IsPaused());
}
else if (condition == SLIDESHOW_ISRANDOM)
{
CGUIWindowSlideShow *slideShow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
CGUIWindowSlideShow *slideShow = g_windowManager.GetWindow<CGUIWindowSlideShow>();
bReturn = (slideShow && slideShow->IsShuffled());
}
else if (condition == SLIDESHOW_ISACTIVE)
{
CGUIWindowSlideShow *slideShow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
CGUIWindowSlideShow *slideShow = g_windowManager.GetWindow<CGUIWindowSlideShow>();
bReturn = (slideShow && slideShow->InSlideShow());
}
else if (condition == SLIDESHOW_ISVIDEO)
{
CGUIWindowSlideShow *slideShow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
CGUIWindowSlideShow *slideShow = g_windowManager.GetWindow<CGUIWindowSlideShow>();
bReturn = (slideShow && slideShow->GetCurrentSlide() && slideShow->GetCurrentSlide()->IsVideo());
}
else if (g_application.m_pPlayer->IsPlaying())
Expand Down Expand Up @@ -7244,7 +7244,7 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI
break;
case PLAYER_SEEKBAR:
{
CGUIDialog *seekBar = (CGUIDialog*)g_windowManager.GetWindow(WINDOW_DIALOG_SEEK_BAR);
CGUIDialog *seekBar = g_windowManager.GetDialog(WINDOW_DIALOG_SEEK_BAR);
bReturn = seekBar ? seekBar->IsDialogRunning() : false;
}
break;
Expand Down Expand Up @@ -10788,7 +10788,7 @@ std::string CGUIInfoManager::GetPictureLabel(int info)
return GetItemLabel(m_currentSlide, LISTITEM_DATE);
else if (info == SLIDE_INDEX)
{
CGUIWindowSlideShow *slideshow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
CGUIWindowSlideShow *slideshow = g_windowManager.GetWindow<CGUIWindowSlideShow>();
if (slideshow && slideshow->NumSlides())
{
return StringUtils::Format("%d/%d", slideshow->CurrentSlide(), slideshow->NumSlides());
Expand Down
2 changes: 1 addition & 1 deletion xbmc/PartyModeManager.cpp
View file
Expand Up @@ -101,7 +101,7 @@ bool CPartyModeManager::Enable(PartyModeContext context /*= PARTYMODECONTEXT_MUS
m_type = m_bIsVideo ? "musicvideos" : "songs";
}

CGUIDialogProgress* pDialog = (CGUIDialogProgress*)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
CGUIDialogProgress* pDialog = g_windowManager.GetWindow<CGUIDialogProgress>();
int iHeading = (m_bIsVideo ? 20250 : 20121);
int iLine0 = (m_bIsVideo ? 20251 : 20123);
pDialog->SetHeading(CVariant{iHeading});
Expand Down
4 changes: 2 additions & 2 deletions xbmc/addons/AddonDll.cpp
View file
Expand Up @@ -152,7 +152,7 @@ bool CAddonDll::LoadDll()
delete m_pDll;
m_pDll = NULL;

CGUIDialogOK* pDialog = (CGUIDialogOK*)g_windowManager.GetWindow(WINDOW_DIALOG_OK);
CGUIDialogOK* pDialog = g_windowManager.GetWindow<CGUIDialogOK>();
if (pDialog)
{
std::string heading = StringUtils::Format("%s: %s", TranslateType(Type(), true).c_str(), Name().c_str());
Expand Down Expand Up @@ -212,7 +212,7 @@ ADDON_STATUS CAddonDll::Create(void* funcTable, void* info)
{ // Addon failed initialization
CLog::Log(LOGERROR, "ADDON: Dll %s - Client returned bad status (%i) from Create and is not usable", Name().c_str(), status);

CGUIDialogOK* pDialog = (CGUIDialogOK*)g_windowManager.GetWindow(WINDOW_DIALOG_OK);
CGUIDialogOK* pDialog = g_windowManager.GetWindow<CGUIDialogOK>();
if (pDialog)
{
std::string heading = StringUtils::Format("%s: %s", TranslateType(Type(), true).c_str(), Name().c_str());
Expand Down
4 changes: 2 additions & 2 deletions xbmc/addons/AddonStatusHandler.cpp
View file
Expand Up @@ -93,7 +93,7 @@ void CAddonStatusHandler::Process()
/* Request to restart the AddOn and data structures need updated */
if (m_status == ADDON_STATUS_NEED_RESTART)
{
CGUIDialogOK* pDialog = (CGUIDialogOK*)g_windowManager.GetWindow(WINDOW_DIALOG_OK);
CGUIDialogOK* pDialog = g_windowManager.GetWindow<CGUIDialogOK>();
if (!pDialog) return;

pDialog->SetHeading(CVariant{heading});
Expand All @@ -105,7 +105,7 @@ void CAddonStatusHandler::Process()
/* Some required settings are missing/invalid */
else if ((m_status == ADDON_STATUS_NEED_SETTINGS) || (m_status == ADDON_STATUS_NEED_SAVEDSETTINGS))
{
CGUIDialogYesNo* pDialogYesNo = (CGUIDialogYesNo*)g_windowManager.GetWindow(WINDOW_DIALOG_YES_NO);
CGUIDialogYesNo* pDialogYesNo = g_windowManager.GetWindow<CGUIDialogYesNo>();
if (!pDialogYesNo) return;

pDialogYesNo->SetHeading(CVariant{heading});
Expand Down
4 changes: 2 additions & 2 deletions xbmc/addons/GUIDialogAddonInfo.cpp
View file
Expand Up @@ -230,7 +230,7 @@ static const std::string LOCAL_CACHE = "\\0_local_cache"; // \0 to give it the l

int CGUIDialogAddonInfo::AskForVersion(std::vector<std::pair<AddonVersion, std::string>>& versions)
{
auto dialog = static_cast<CGUIDialogSelect*>(g_windowManager.GetWindow(WINDOW_DIALOG_SELECT));
auto dialog = g_windowManager.GetWindow<CGUIDialogSelect>();
dialog->Reset();
dialog->SetHeading(CVariant{21338});
dialog->SetUseDetails(true);
Expand Down Expand Up @@ -484,7 +484,7 @@ bool CGUIDialogAddonInfo::ShowForItem(const CFileItemPtr& item)
if (!item)
return false;

CGUIDialogAddonInfo* dialog = (CGUIDialogAddonInfo*)g_windowManager.GetWindow(WINDOW_DIALOG_ADDON_INFO);
CGUIDialogAddonInfo* dialog = g_windowManager.GetWindow<CGUIDialogAddonInfo>();
if (!dialog)
return false;
if (!dialog->SetItem(item))
Expand Down
4 changes: 2 additions & 2 deletions xbmc/addons/GUIDialogAddonSettings.cpp
View file
Expand Up @@ -209,7 +209,7 @@ bool CGUIDialogAddonSettings::ShowAndGetInput(const AddonPtr &addon, bool saveTo
{
// Create the dialog
CGUIDialogAddonSettings* pDialog = NULL;
pDialog = (CGUIDialogAddonSettings*) g_windowManager.GetWindow(WINDOW_DIALOG_ADDON_SETTINGS);
pDialog = g_windowManager.GetWindow<CGUIDialogAddonSettings>();
if (!pDialog)
return false;

Expand Down Expand Up @@ -307,7 +307,7 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl)
}
else if (type == "select")
{
CGUIDialogSelect *pDlg = (CGUIDialogSelect*)g_windowManager.GetWindow(WINDOW_DIALOG_SELECT);
CGUIDialogSelect *pDlg = g_windowManager.GetWindow<CGUIDialogSelect>();
if (pDlg)
{
pDlg->SetHeading(CVariant{label});
Expand Down
2 changes: 1 addition & 1 deletion xbmc/addons/GUIWindowAddonBrowser.cpp
View file
Expand Up @@ -378,7 +378,7 @@ int CGUIWindowAddonBrowser::SelectAddonID(const std::vector<ADDON::TYPE> &types,
if (showInstallable)
showMore = false;

CGUIDialogSelect *dialog = (CGUIDialogSelect*)g_windowManager.GetWindow(WINDOW_DIALOG_SELECT);
CGUIDialogSelect *dialog = g_windowManager.GetWindow<CGUIDialogSelect>();
if (!dialog)
return -1;

Expand Down
2 changes: 1 addition & 1 deletion xbmc/addons/RepositoryUpdater.cpp
View file
Expand Up @@ -113,7 +113,7 @@ bool CRepositoryUpdater::CheckForUpdates(bool showProgress)

static void SetProgressIndicator(CRepositoryUpdateJob* job)
{
auto* dialog = static_cast<CGUIDialogExtendedProgressBar*>(g_windowManager.GetWindow(WINDOW_DIALOG_EXT_PROGRESS));
auto dialog = g_windowManager.GetWindow<CGUIDialogExtendedProgressBar>();
if (dialog)
job->SetProgressIndicators(dialog->GetHandle(g_localizeStrings.Get(24092)), nullptr);
}
Expand Down
2 changes: 1 addition & 1 deletion xbmc/addons/Skin.cpp
View file
Expand Up @@ -380,7 +380,7 @@ void CSkinInfo::OnPostInstall(bool update, bool modal)
if (IsInUse() || (!update && !modal &&
HELPERS::ShowYesNoDialogText(CVariant{Name()}, CVariant{24099}) == DialogResponse::YES))
{
CGUIDialogKaiToast *toast = (CGUIDialogKaiToast *)g_windowManager.GetWindow(WINDOW_DIALOG_KAI_TOAST);
CGUIDialogKaiToast *toast = g_windowManager.GetWindow<CGUIDialogKaiToast>();
if (toast)
{
toast->ResetTimer();
Expand Down
36 changes: 18 additions & 18 deletions xbmc/addons/interfaces/GUI/AddonCallbacksGUI.cpp
View file
Expand Up @@ -338,7 +338,7 @@ void CAddonCallbacksGUI::Window_Delete(void *addonData, GUIHANDLE handle)
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return;

Expand Down Expand Up @@ -393,7 +393,7 @@ bool CAddonCallbacksGUI::Window_Show(void *addonData, GUIHANDLE handle)
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return false;

Expand Down Expand Up @@ -425,7 +425,7 @@ bool CAddonCallbacksGUI::Window_Close(void *addonData, GUIHANDLE handle)
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return false;

Expand Down Expand Up @@ -463,7 +463,7 @@ bool CAddonCallbacksGUI::Window_DoModal(void *addonData, GUIHANDLE handle)
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return false;

Expand All @@ -490,7 +490,7 @@ bool CAddonCallbacksGUI::Window_SetFocusId(void *addonData, GUIHANDLE handle, in
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return false;

Expand Down Expand Up @@ -525,7 +525,7 @@ int CAddonCallbacksGUI::Window_GetFocusId(void *addonData, GUIHANDLE handle)
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return iControlId;

Expand Down Expand Up @@ -563,7 +563,7 @@ bool CAddonCallbacksGUI::Window_SetCoordinateResolution(void *addonData, GUIHAND
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return false;

Expand All @@ -587,7 +587,7 @@ void CAddonCallbacksGUI::Window_SetProperty(void *addonData, GUIHANDLE handle, c
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return;

Expand All @@ -614,7 +614,7 @@ void CAddonCallbacksGUI::Window_SetPropertyInt(void *addonData, GUIHANDLE handle
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return;

Expand All @@ -641,7 +641,7 @@ void CAddonCallbacksGUI::Window_SetPropertyBool(void *addonData, GUIHANDLE handl
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return;

Expand All @@ -668,7 +668,7 @@ void CAddonCallbacksGUI::Window_SetPropertyDouble(void *addonData, GUIHANDLE han
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return;

Expand All @@ -695,7 +695,7 @@ const char* CAddonCallbacksGUI::Window_GetProperty(void *addonData, GUIHANDLE ha
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return NULL;

Expand Down Expand Up @@ -724,7 +724,7 @@ int CAddonCallbacksGUI::Window_GetPropertyInt(void *addonData, GUIHANDLE handle,
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return -1;

Expand Down Expand Up @@ -753,7 +753,7 @@ bool CAddonCallbacksGUI::Window_GetPropertyBool(void *addonData, GUIHANDLE handl
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return false;

Expand Down Expand Up @@ -782,7 +782,7 @@ double CAddonCallbacksGUI::Window_GetPropertyDouble(void *addonData, GUIHANDLE h
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return 0.0;

Expand Down Expand Up @@ -811,7 +811,7 @@ void CAddonCallbacksGUI::Window_ClearProperties(void *addonData, GUIHANDLE handl
}

CGUIAddonWindow *pAddonWindow = (CGUIAddonWindow*)handle;
CGUIWindow *pWindow = (CGUIWindow*)g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
CGUIWindow *pWindow = g_windowManager.GetWindow(pAddonWindow->m_iWindowId);
if (!pWindow)
return;

Expand Down Expand Up @@ -1890,7 +1890,7 @@ bool CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputLineButtonText(const char *
//@{
void CAddonCallbacksGUI::Dialog_TextViewer(const char *heading, const char *text)
{
CGUIDialogTextViewer* pDialog = (CGUIDialogTextViewer*)g_windowManager.GetWindow(WINDOW_DIALOG_TEXT_VIEWER);
CGUIDialogTextViewer* pDialog = g_windowManager.GetWindow<CGUIDialogTextViewer>();
pDialog->SetHeading(heading);
pDialog->SetText(text);
pDialog->Open();
Expand All @@ -1901,7 +1901,7 @@ void CAddonCallbacksGUI::Dialog_TextViewer(const char *heading, const char *text
//@{
int CAddonCallbacksGUI::Dialog_Select(const char *heading, const char *entries[], unsigned int size, int selected)
{
CGUIDialogSelect* pDialog = (CGUIDialogSelect*)g_windowManager.GetWindow(WINDOW_DIALOG_SELECT);
CGUIDialogSelect* pDialog = g_windowManager.GetWindow<CGUIDialogSelect>();
pDialog->Reset();
pDialog->SetHeading(CVariant{heading});

Expand Down
2 changes: 1 addition & 1 deletion xbmc/cdrip/CDDARipJob.cpp
View file
Expand Up @@ -90,7 +90,7 @@ bool CCDDARipJob::DoWork()

// setup the progress dialog
CGUIDialogExtendedProgressBar* pDlgProgress =
(CGUIDialogExtendedProgressBar*)g_windowManager.GetWindow(WINDOW_DIALOG_EXT_PROGRESS);
g_windowManager.GetWindow<CGUIDialogExtendedProgressBar>();
CGUIDialogProgressBarHandle* handle = pDlgProgress->GetHandle(g_localizeStrings.Get(605));

int iTrack = atoi(m_input.substr(13, m_input.size() - 13 - 5).c_str());
Expand Down

0 comments on commit 6af40c2

Please sign in to comment.