aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--system/keymaps/gamepad.xml2
-rw-r--r--system/keymaps/joystick.xml2
-rw-r--r--system/keymaps/keyboard.xml2
-rw-r--r--system/keymaps/remote.xml2
-rw-r--r--xbmc/Application.cpp9
-rw-r--r--xbmc/cores/VideoPlayer/VideoPlayer.cpp10
-rw-r--r--xbmc/input/ButtonTranslator.cpp2
-rw-r--r--xbmc/input/Key.h2
-rw-r--r--xbmc/interfaces/json-rpc/InputOperations.cpp2
-rw-r--r--xbmc/interfaces/json-rpc/schema/version.txt2
-rw-r--r--xbmc/pictures/GUIWindowSlideShow.cpp2
-rw-r--r--xbmc/platform/darwin/DarwinUtils.mm1
12 files changed, 19 insertions, 19 deletions
diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml
index 9408133200..a9d1c65066 100644
--- a/system/keymaps/gamepad.xml
+++ b/system/keymaps/gamepad.xml
@@ -177,7 +177,7 @@
<B>Stop</B>
<Y>Rotate</Y>
<X>ZoomNormal</X>
- <black>CodecInfo</black>
+ <black>Info</black>
<white>Info</white>
<righttrigger>NextPicture</righttrigger>
<lefttrigger>PreviousPicture</lefttrigger>
diff --git a/system/keymaps/joystick.xml b/system/keymaps/joystick.xml
index 516726d76a..6b7aa92e6a 100644
--- a/system/keymaps/joystick.xml
+++ b/system/keymaps/joystick.xml
@@ -141,7 +141,7 @@
<b>Stop</b>
<y>ZoomNormal</y>
<leftbumper>Rotate</leftbumper>
- <rightbumper>CodecInfo</rightbumper>
+ <rightbumper>Info</rightbumper>
<up>ZoomIn</up>
<down>ZoomOut</down>
<left>PreviousPicture</left>
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index c6b4e7d23e..90517afa61 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -441,7 +441,7 @@
<eight>ZoomLevel8</eight>
<nine>ZoomLevel9</nine>
<i>Info</i>
- <o>PlayerProcessInfo</o>
+ <o>Info</o>
<period>NextPicture</period>
<comma>PreviousPicture</comma>
<plus>ZoomIn</plus>
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index 07f2654866..dedcc9bfd0 100644
--- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml
@@ -259,7 +259,7 @@
<seven>ZoomLevel7</seven>
<eight>ZoomLevel8</eight>
<nine>ZoomLevel9</nine>
- <info>CodecInfo</info>
+ <info>Info</info>
<skipplus>NextPicture</skipplus>
<skipminus>PreviousPicture</skipminus>
<title>Info</title>
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index db2f31296d..1c33cbba5a 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2374,15 +2374,6 @@ bool CApplication::OnAction(const CAction &action)
g_windowManager.ActivateWindow(WINDOW_MUSIC_PLAYLIST);
return true;
}
- if (action.GetID() == ACTION_PLAYER_PROCESS_INFO)
- {
- if (m_pPlayer->GetCurrentPlayer() == "VideoPlayer" &&
- g_windowManager.GetActiveWindow() != WINDOW_DIALOG_PLAYER_PROCESS_INFO)
- {
- g_windowManager.ActivateWindow(WINDOW_DIALOG_PLAYER_PROCESS_INFO);
- return true;
- }
- }
return false;
}
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
index f8e307922f..df1539b505 100644
--- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -4486,9 +4486,17 @@ bool CVideoPlayer::OnAction(const CAction &action)
CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(25011),
g_localizeStrings.Get(m_SkipCommercials ? 25013 : 25012));
break;
- case ACTION_SHOW_CODEC:
+ case ACTION_PLAYER_DEBUG:
m_renderManager.ToggleDebug();
break;
+
+ case ACTION_PLAYER_PROCESS_INFO:
+ if (g_windowManager.GetActiveWindow() != WINDOW_DIALOG_PLAYER_PROCESS_INFO)
+ {
+ g_windowManager.ActivateWindow(WINDOW_DIALOG_PLAYER_PROCESS_INFO);
+ return true;
+ }
+ break;
}
// return false to inform the caller we didn't handle the message
diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp
index 1cbf8dd2d9..97bb27cb17 100644
--- a/xbmc/input/ButtonTranslator.cpp
+++ b/xbmc/input/ButtonTranslator.cpp
@@ -87,7 +87,7 @@ static const ActionMapping actions[] =
{ "showsubtitles" , ACTION_SHOW_SUBTITLES },
{ "nextsubtitle" , ACTION_NEXT_SUBTITLE },
{ "cyclesubtitle" , ACTION_CYCLE_SUBTITLE },
- { "codecinfo" , ACTION_SHOW_CODEC },
+ { "playerdebug" , ACTION_PLAYER_DEBUG },
{ "playerprocessinfo" , ACTION_PLAYER_PROCESS_INFO },
{ "nextpicture" , ACTION_NEXT_PICTURE },
{ "previouspicture" , ACTION_PREV_PICTURE },
diff --git a/xbmc/input/Key.h b/xbmc/input/Key.h
index 1147137a73..bdc478cbd5 100644
--- a/xbmc/input/Key.h
+++ b/xbmc/input/Key.h
@@ -172,7 +172,7 @@
#define ACTION_SHOW_OSD 24 //!< show/hide OSD. Can b used in videoFullScreen.xml window id=2005
#define ACTION_SHOW_SUBTITLES 25 //!< turn subtitles on/off. Can b used in videoFullScreen.xml window id=2005
#define ACTION_NEXT_SUBTITLE 26 //!< switch to next subtitle of movie. Can b used in videoFullScreen.xml window id=2005
-#define ACTION_SHOW_CODEC 27 //!< show debug info for VideoPlayer
+#define ACTION_PLAYER_DEBUG 27 //!< show debug info for VideoPlayer
#define ACTION_NEXT_PICTURE 28 //!< show next picture of slideshow. Can b used in slideshow.xml window id=2007
#define ACTION_PREV_PICTURE 29 //!< show previous picture of slideshow. Can b used in slideshow.xml window id=2007
#define ACTION_ZOOM_OUT 30 //!< zoom in picture during slideshow. Can b used in slideshow.xml window id=2007
diff --git a/xbmc/interfaces/json-rpc/InputOperations.cpp b/xbmc/interfaces/json-rpc/InputOperations.cpp
index ee75e5d912..6788b8f9be 100644
--- a/xbmc/interfaces/json-rpc/InputOperations.cpp
+++ b/xbmc/interfaces/json-rpc/InputOperations.cpp
@@ -142,7 +142,7 @@ JSONRPC_STATUS CInputOperations::Home(const std::string &method, ITransportLayer
JSONRPC_STATUS CInputOperations::ShowCodec(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- return SendAction(ACTION_SHOW_CODEC);
+ return MethodNotFound;
}
JSONRPC_STATUS CInputOperations::ShowPlayerProcessInfo(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
index 2540a3a5bd..c650e0fce4 100644
--- a/xbmc/interfaces/json-rpc/schema/version.txt
+++ b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-7.20.0
+7.20.1
diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp
index 2890113e6d..c847bb4f6b 100644
--- a/xbmc/pictures/GUIWindowSlideShow.cpp
+++ b/xbmc/pictures/GUIWindowSlideShow.cpp
@@ -737,7 +737,7 @@ bool CGUIWindowSlideShow::OnAction(const CAction &action)
{
switch (action.GetID())
{
- case ACTION_SHOW_CODEC:
+ case ACTION_SHOW_INFO:
{
CGUIDialogPictureInfo *pictureInfo = (CGUIDialogPictureInfo *)g_windowManager.GetWindow(WINDOW_DIALOG_PICTURE_INFO);
if (pictureInfo)
diff --git a/xbmc/platform/darwin/DarwinUtils.mm b/xbmc/platform/darwin/DarwinUtils.mm
index 11be67a747..509cce5cc7 100644
--- a/xbmc/platform/darwin/DarwinUtils.mm
+++ b/xbmc/platform/darwin/DarwinUtils.mm
@@ -635,6 +635,7 @@ const std::string& CDarwinUtils::GetManufacturer(void)
bool CDarwinUtils::IsAliasShortcut(const std::string& path, bool isdirectory)
{
bool ret = false;
+
#if defined(TARGET_DARWIN_OSX)
CCocoaAutoPool pool;
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-19 04:09:34 +0000