mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
xbmc: update PR4445
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
42b8b360f1
commit
14bbc0b3ca
@ -1,8 +1,19 @@
|
|||||||
|
From 99dbf128e407c6ff89d93798c2f53a427a9945c8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: ruuk <xbmc@2ndmind.net>
|
||||||
|
Date: Wed, 19 Mar 2014 12:56:39 -0700
|
||||||
|
Subject: [PATCH 1/2] Apply the patch amet provided for stopping a playing wav
|
||||||
|
previously started by playSFX
|
||||||
|
|
||||||
|
---
|
||||||
|
xbmc/interfaces/legacy/ModuleXbmc.cpp | 7 +++++++
|
||||||
|
xbmc/interfaces/legacy/ModuleXbmc.h | 8 ++++++++
|
||||||
|
2 files changed, 15 insertions(+)
|
||||||
|
|
||||||
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
|
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
|
||||||
index 38564212d7d1ab7f15e486674e567119fcec8c8f..f9b02175db585e56a95895621536d504ebeb268a 100644
|
index 3856421..d4c039a 100644
|
||||||
--- a/xbmc/interfaces/legacy/ModuleXbmc.cpp
|
--- a/xbmc/interfaces/legacy/ModuleXbmc.cpp
|
||||||
+++ b/xbmc/interfaces/legacy/ModuleXbmc.cpp
|
+++ b/xbmc/interfaces/legacy/ModuleXbmc.cpp
|
||||||
@@ -337,6 +337,13 @@ namespace XBMCAddon
|
@@ -337,6 +337,13 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -17,10 +28,10 @@ index 38564212d7d1ab7f15e486674e567119fcec8c8f..f9b02175db585e56a95895621536d504
|
|||||||
{
|
{
|
||||||
XBMC_TRACE;
|
XBMC_TRACE;
|
||||||
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.h b/xbmc/interfaces/legacy/ModuleXbmc.h
|
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.h b/xbmc/interfaces/legacy/ModuleXbmc.h
|
||||||
index 9e04cfa114dfa906d9fafb2d95aa324dd6e6ca22..e6e4b3cebb4971c4201c31216fb5343f2305c925 100644
|
index 9e04cfa..f26fa93 100644
|
||||||
--- a/xbmc/interfaces/legacy/ModuleXbmc.h
|
--- a/xbmc/interfaces/legacy/ModuleXbmc.h
|
||||||
+++ b/xbmc/interfaces/legacy/ModuleXbmc.h
|
+++ b/xbmc/interfaces/legacy/ModuleXbmc.h
|
||||||
@@ -230,6 +230,14 @@ namespace XBMCAddon
|
@@ -230,6 +230,14 @@
|
||||||
void playSFX(const char* filename);
|
void playSFX(const char* filename);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -33,6 +44,45 @@ index 9e04cfa114dfa906d9fafb2d95aa324dd6e6ca22..e6e4b3cebb4971c4201c31216fb5343f
|
|||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
* enableNavSounds(yesNo) -- Enables/Disables nav sounds
|
* enableNavSounds(yesNo) -- Enables/Disables nav sounds
|
||||||
*
|
*
|
||||||
* yesNo : integer - enable (True) or disable (False) nav sounds
|
* yesNo : integer - enable (True) or disable (False) nav sounds
|
||||||
|
--
|
||||||
|
1.8.5.5
|
||||||
|
|
||||||
|
|
||||||
|
From 2d78550bfa28e743dca562a5074d6790dbcab54a Mon Sep 17 00:00:00 2001
|
||||||
|
From: ruuk <xbmc@2ndmind.net>
|
||||||
|
Date: Fri, 21 Mar 2014 03:22:23 -0700
|
||||||
|
Subject: [PATCH 2/2] removed g_audioManager.UnLoad() from stopSFX
|
||||||
|
|
||||||
|
---
|
||||||
|
xbmc/interfaces/legacy/ModuleXbmc.cpp | 13 ++++++-------
|
||||||
|
1 file changed, 6 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
|
||||||
|
index d4c039a..e4ad558 100644
|
||||||
|
--- a/xbmc/interfaces/legacy/ModuleXbmc.cpp
|
||||||
|
+++ b/xbmc/interfaces/legacy/ModuleXbmc.cpp
|
||||||
|
@@ -337,13 +337,12 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- void stopSFX()
|
||||||
|
- {
|
||||||
|
- XBMC_TRACE;
|
||||||
|
- g_audioManager.Stop();
|
||||||
|
- g_audioManager.UnLoad();
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
+ void stopSFX()
|
||||||
|
+ {
|
||||||
|
+ XBMC_TRACE;
|
||||||
|
+ g_audioManager.Stop();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
void enableNavSounds(bool yesNo)
|
||||||
|
{
|
||||||
|
XBMC_TRACE;
|
||||||
|
--
|
||||||
|
1.8.5.5
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user