mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
kodi: add 925a4e4d7eglobally
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
db9bb1507f
commit
06743d40e0
@ -0,0 +1,111 @@
|
||||
From 925a4e4d7e775cc246518d6ea934d1f93a069870 Mon Sep 17 00:00:00 2001
|
||||
From: anaconda <anaconda@menakite.eu>
|
||||
Date: Wed, 25 Feb 2015 18:22:21 +0100
|
||||
Subject: [PATCH] Load OSD dialogs on startup.
|
||||
|
||||
Fixes skipped frames the first time they're loaded in memory on less powered
|
||||
devices, like a Raspberry Pi, when using DVDPlayer.
|
||||
See http://forum.kodi.tv/showthread.php?tid=211501&pid=1938811#pid1938811
|
||||
---
|
||||
xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp | 1 +
|
||||
xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp | 1 +
|
||||
xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp | 4 +++-
|
||||
xbmc/video/dialogs/GUIDialogSubtitles.cpp | 2 +-
|
||||
xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp | 2 +-
|
||||
xbmc/video/dialogs/GUIDialogVideoOSD.cpp | 2 +-
|
||||
xbmc/video/dialogs/GUIDialogVideoSettings.cpp | 4 +++-
|
||||
7 files changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
|
||||
index 5fb5c79..36f7273 100644
|
||||
--- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
|
||||
+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
|
||||
@@ -50,6 +50,7 @@ CGUIDialogPVRChannelsOSD::CGUIDialogPVRChannelsOSD() :
|
||||
CGUIDialog(WINDOW_DIALOG_PVR_OSD_CHANNELS, "DialogPVRChannelsOSD.xml"),
|
||||
Observer()
|
||||
{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
m_vecItems = new CFileItemList;
|
||||
}
|
||||
|
||||
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
|
||||
index cf7e5d2..9e9ed32 100644
|
||||
--- a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
|
||||
+++ b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
|
||||
@@ -35,6 +35,7 @@ using namespace PVR;
|
||||
CGUIDialogPVRGuideOSD::CGUIDialogPVRGuideOSD()
|
||||
: CGUIDialog(WINDOW_DIALOG_PVR_OSD_GUIDE, "DialogPVRGuideOSD.xml")
|
||||
{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
m_vecItems = new CFileItemList;
|
||||
}
|
||||
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
|
||||
index 32a9ba4..9999bdf 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
|
||||
@@ -62,7 +62,9 @@ using namespace std;
|
||||
CGUIDialogAudioSubtitleSettings::CGUIDialogAudioSubtitleSettings()
|
||||
: CGUIDialogSettingsManualBase(WINDOW_DIALOG_AUDIO_OSD_SETTINGS, "VideoOSDSettings.xml"),
|
||||
m_passthrough(false)
|
||||
-{ }
|
||||
+{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
+}
|
||||
|
||||
CGUIDialogAudioSubtitleSettings::~CGUIDialogAudioSubtitleSettings()
|
||||
{ }
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
|
||||
index e3939f1..e184d53 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
|
||||
@@ -99,7 +99,7 @@ class CSubtitlesJob: public CJob
|
||||
CGUIDialogSubtitles::CGUIDialogSubtitles(void)
|
||||
: CGUIDialog(WINDOW_DIALOG_SUBTITLES, "DialogSubtitles.xml")
|
||||
{
|
||||
- m_loadType = KEEP_IN_MEMORY;
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
m_subtitles = new CFileItemList;
|
||||
m_serviceItems = new CFileItemList;
|
||||
m_pausedOnRun = false;
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
|
||||
index 1ccabc8..43691bf 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
|
||||
@@ -61,7 +61,7 @@ CGUIDialogVideoBookmarks::CGUIDialogVideoBookmarks()
|
||||
: CGUIDialog(WINDOW_DIALOG_VIDEO_BOOKMARKS, "VideoOSDBookmarks.xml")
|
||||
{
|
||||
m_vecItems = new CFileItemList;
|
||||
- m_loadType = KEEP_IN_MEMORY;
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
}
|
||||
|
||||
CGUIDialogVideoBookmarks::~CGUIDialogVideoBookmarks()
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
|
||||
index 98c3c5a..ba1b5f4 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
|
||||
@@ -35,7 +35,7 @@ using namespace PVR;
|
||||
CGUIDialogVideoOSD::CGUIDialogVideoOSD(void)
|
||||
: CGUIDialog(WINDOW_DIALOG_VIDEO_OSD, "VideoOSD.xml")
|
||||
{
|
||||
- m_loadType = KEEP_IN_MEMORY;
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
}
|
||||
|
||||
CGUIDialogVideoOSD::~CGUIDialogVideoOSD(void)
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp
|
||||
index ca65fdc..fbd2a52 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp
|
||||
@@ -65,7 +65,9 @@ using namespace std;
|
||||
CGUIDialogVideoSettings::CGUIDialogVideoSettings()
|
||||
: CGUIDialogSettingsManualBase(WINDOW_DIALOG_VIDEO_OSD_SETTINGS, "VideoOSDSettings.xml"),
|
||||
m_viewModeChanged(false)
|
||||
-{ }
|
||||
+{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
+}
|
||||
|
||||
CGUIDialogVideoSettings::~CGUIDialogVideoSettings()
|
||||
{ }
|
||||
@ -6452,118 +6452,6 @@ index 77b9461..2a3619f 100644
|
||||
|
||||
int buffer = g_renderManager.WaitForBuffer(CThread::m_bStop);
|
||||
|
||||
From 4ad6d848a76c9487f849cb6a7a035d8fc53932ee Mon Sep 17 00:00:00 2001
|
||||
From: anaconda <anaconda@menakite.eu>
|
||||
Date: Wed, 25 Feb 2015 18:22:21 +0100
|
||||
Subject: [PATCH 68/70] Load OSD dialogs on startup.
|
||||
|
||||
Fixes skipped frames the first time they're loaded in memory on less powered
|
||||
devices, like a Raspberry Pi, when using DVDPlayer.
|
||||
See http://forum.kodi.tv/showthread.php?tid=211501&pid=1938811#pid1938811
|
||||
---
|
||||
xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp | 1 +
|
||||
xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp | 1 +
|
||||
xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp | 4 +++-
|
||||
xbmc/video/dialogs/GUIDialogSubtitles.cpp | 2 +-
|
||||
xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp | 2 +-
|
||||
xbmc/video/dialogs/GUIDialogVideoOSD.cpp | 2 +-
|
||||
xbmc/video/dialogs/GUIDialogVideoSettings.cpp | 4 +++-
|
||||
7 files changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
|
||||
index 5fb5c79..36f7273 100644
|
||||
--- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
|
||||
+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
|
||||
@@ -50,6 +50,7 @@ CGUIDialogPVRChannelsOSD::CGUIDialogPVRChannelsOSD() :
|
||||
CGUIDialog(WINDOW_DIALOG_PVR_OSD_CHANNELS, "DialogPVRChannelsOSD.xml"),
|
||||
Observer()
|
||||
{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
m_vecItems = new CFileItemList;
|
||||
}
|
||||
|
||||
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
|
||||
index cf7e5d2..9e9ed32 100644
|
||||
--- a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
|
||||
+++ b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
|
||||
@@ -35,6 +35,7 @@ using namespace PVR;
|
||||
CGUIDialogPVRGuideOSD::CGUIDialogPVRGuideOSD()
|
||||
: CGUIDialog(WINDOW_DIALOG_PVR_OSD_GUIDE, "DialogPVRGuideOSD.xml")
|
||||
{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
m_vecItems = new CFileItemList;
|
||||
}
|
||||
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
|
||||
index 32a9ba4..9999bdf 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
|
||||
@@ -62,7 +62,9 @@ using namespace std;
|
||||
CGUIDialogAudioSubtitleSettings::CGUIDialogAudioSubtitleSettings()
|
||||
: CGUIDialogSettingsManualBase(WINDOW_DIALOG_AUDIO_OSD_SETTINGS, "VideoOSDSettings.xml"),
|
||||
m_passthrough(false)
|
||||
-{ }
|
||||
+{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
+}
|
||||
|
||||
CGUIDialogAudioSubtitleSettings::~CGUIDialogAudioSubtitleSettings()
|
||||
{ }
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
|
||||
index e3939f1..e184d53 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
|
||||
@@ -99,7 +99,7 @@ class CSubtitlesJob: public CJob
|
||||
CGUIDialogSubtitles::CGUIDialogSubtitles(void)
|
||||
: CGUIDialog(WINDOW_DIALOG_SUBTITLES, "DialogSubtitles.xml")
|
||||
{
|
||||
- m_loadType = KEEP_IN_MEMORY;
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
m_subtitles = new CFileItemList;
|
||||
m_serviceItems = new CFileItemList;
|
||||
m_pausedOnRun = false;
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
|
||||
index 1ccabc8..43691bf 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
|
||||
@@ -61,7 +61,7 @@ CGUIDialogVideoBookmarks::CGUIDialogVideoBookmarks()
|
||||
: CGUIDialog(WINDOW_DIALOG_VIDEO_BOOKMARKS, "VideoOSDBookmarks.xml")
|
||||
{
|
||||
m_vecItems = new CFileItemList;
|
||||
- m_loadType = KEEP_IN_MEMORY;
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
}
|
||||
|
||||
CGUIDialogVideoBookmarks::~CGUIDialogVideoBookmarks()
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
|
||||
index 98c3c5a..ba1b5f4 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
|
||||
@@ -35,7 +35,7 @@ using namespace PVR;
|
||||
CGUIDialogVideoOSD::CGUIDialogVideoOSD(void)
|
||||
: CGUIDialog(WINDOW_DIALOG_VIDEO_OSD, "VideoOSD.xml")
|
||||
{
|
||||
- m_loadType = KEEP_IN_MEMORY;
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
}
|
||||
|
||||
CGUIDialogVideoOSD::~CGUIDialogVideoOSD(void)
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp
|
||||
index ca65fdc..fbd2a52 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp
|
||||
@@ -65,7 +65,9 @@ using namespace std;
|
||||
CGUIDialogVideoSettings::CGUIDialogVideoSettings()
|
||||
: CGUIDialogSettingsManualBase(WINDOW_DIALOG_VIDEO_OSD_SETTINGS, "VideoOSDSettings.xml"),
|
||||
m_viewModeChanged(false)
|
||||
-{ }
|
||||
+{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
+}
|
||||
|
||||
CGUIDialogVideoSettings::~CGUIDialogVideoSettings()
|
||||
{ }
|
||||
|
||||
From 9bca0b7b17808aea67a47c030b72d3247cf6dd88 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Sun, 1 Mar 2015 14:49:12 +0000
|
||||
|
||||
@ -6452,118 +6452,6 @@ index 77b9461..2a3619f 100644
|
||||
|
||||
int buffer = g_renderManager.WaitForBuffer(CThread::m_bStop);
|
||||
|
||||
From 4ad6d848a76c9487f849cb6a7a035d8fc53932ee Mon Sep 17 00:00:00 2001
|
||||
From: anaconda <anaconda@menakite.eu>
|
||||
Date: Wed, 25 Feb 2015 18:22:21 +0100
|
||||
Subject: [PATCH 68/70] Load OSD dialogs on startup.
|
||||
|
||||
Fixes skipped frames the first time they're loaded in memory on less powered
|
||||
devices, like a Raspberry Pi, when using DVDPlayer.
|
||||
See http://forum.kodi.tv/showthread.php?tid=211501&pid=1938811#pid1938811
|
||||
---
|
||||
xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp | 1 +
|
||||
xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp | 1 +
|
||||
xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp | 4 +++-
|
||||
xbmc/video/dialogs/GUIDialogSubtitles.cpp | 2 +-
|
||||
xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp | 2 +-
|
||||
xbmc/video/dialogs/GUIDialogVideoOSD.cpp | 2 +-
|
||||
xbmc/video/dialogs/GUIDialogVideoSettings.cpp | 4 +++-
|
||||
7 files changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
|
||||
index 5fb5c79..36f7273 100644
|
||||
--- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
|
||||
+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
|
||||
@@ -50,6 +50,7 @@ CGUIDialogPVRChannelsOSD::CGUIDialogPVRChannelsOSD() :
|
||||
CGUIDialog(WINDOW_DIALOG_PVR_OSD_CHANNELS, "DialogPVRChannelsOSD.xml"),
|
||||
Observer()
|
||||
{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
m_vecItems = new CFileItemList;
|
||||
}
|
||||
|
||||
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
|
||||
index cf7e5d2..9e9ed32 100644
|
||||
--- a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
|
||||
+++ b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
|
||||
@@ -35,6 +35,7 @@ using namespace PVR;
|
||||
CGUIDialogPVRGuideOSD::CGUIDialogPVRGuideOSD()
|
||||
: CGUIDialog(WINDOW_DIALOG_PVR_OSD_GUIDE, "DialogPVRGuideOSD.xml")
|
||||
{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
m_vecItems = new CFileItemList;
|
||||
}
|
||||
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
|
||||
index 32a9ba4..9999bdf 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
|
||||
@@ -62,7 +62,9 @@ using namespace std;
|
||||
CGUIDialogAudioSubtitleSettings::CGUIDialogAudioSubtitleSettings()
|
||||
: CGUIDialogSettingsManualBase(WINDOW_DIALOG_AUDIO_OSD_SETTINGS, "VideoOSDSettings.xml"),
|
||||
m_passthrough(false)
|
||||
-{ }
|
||||
+{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
+}
|
||||
|
||||
CGUIDialogAudioSubtitleSettings::~CGUIDialogAudioSubtitleSettings()
|
||||
{ }
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
|
||||
index e3939f1..e184d53 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
|
||||
@@ -99,7 +99,7 @@ class CSubtitlesJob: public CJob
|
||||
CGUIDialogSubtitles::CGUIDialogSubtitles(void)
|
||||
: CGUIDialog(WINDOW_DIALOG_SUBTITLES, "DialogSubtitles.xml")
|
||||
{
|
||||
- m_loadType = KEEP_IN_MEMORY;
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
m_subtitles = new CFileItemList;
|
||||
m_serviceItems = new CFileItemList;
|
||||
m_pausedOnRun = false;
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
|
||||
index 1ccabc8..43691bf 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
|
||||
@@ -61,7 +61,7 @@ CGUIDialogVideoBookmarks::CGUIDialogVideoBookmarks()
|
||||
: CGUIDialog(WINDOW_DIALOG_VIDEO_BOOKMARKS, "VideoOSDBookmarks.xml")
|
||||
{
|
||||
m_vecItems = new CFileItemList;
|
||||
- m_loadType = KEEP_IN_MEMORY;
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
}
|
||||
|
||||
CGUIDialogVideoBookmarks::~CGUIDialogVideoBookmarks()
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
|
||||
index 98c3c5a..ba1b5f4 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
|
||||
@@ -35,7 +35,7 @@ using namespace PVR;
|
||||
CGUIDialogVideoOSD::CGUIDialogVideoOSD(void)
|
||||
: CGUIDialog(WINDOW_DIALOG_VIDEO_OSD, "VideoOSD.xml")
|
||||
{
|
||||
- m_loadType = KEEP_IN_MEMORY;
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
}
|
||||
|
||||
CGUIDialogVideoOSD::~CGUIDialogVideoOSD(void)
|
||||
diff --git a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp
|
||||
index ca65fdc..fbd2a52 100644
|
||||
--- a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp
|
||||
+++ b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp
|
||||
@@ -65,7 +65,9 @@ using namespace std;
|
||||
CGUIDialogVideoSettings::CGUIDialogVideoSettings()
|
||||
: CGUIDialogSettingsManualBase(WINDOW_DIALOG_VIDEO_OSD_SETTINGS, "VideoOSDSettings.xml"),
|
||||
m_viewModeChanged(false)
|
||||
-{ }
|
||||
+{
|
||||
+ m_loadType = LOAD_ON_GUI_INIT;
|
||||
+}
|
||||
|
||||
CGUIDialogVideoSettings::~CGUIDialogVideoSettings()
|
||||
{ }
|
||||
|
||||
From 9bca0b7b17808aea67a47c030b72d3247cf6dd88 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Sun, 1 Mar 2015 14:49:12 +0000
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user