jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc: update PR4445

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-03-29 02:25:10 +01:00
parent 320230748c
commit c1d03046eb
1 changed files with 13 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
packages/mediacenter/xbmc/patches/xbmc-999.80.011-PR4445.patch
View File

@ -1,8 +1,8 @@
From 99dbf128e407c6ff89d93798c2f53a427a9945c8 Mon Sep 17 00:00:00 2001
From b5cf69a48f25cf2811aec849e27a138213936b21 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
Subject: [PATCH] Add stopSFX() to ModuleXbmc to allow stopping of sounds
started with playSFX()
---
xbmc/interfaces/legacy/ModuleXbmc.cpp | 7 +++++++
@ -10,7 +10,7 @@ Subject: [PATCH 1/2] Apply the patch amet provided for stopping a playing wav
2 files changed, 15 insertions(+)
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
index 3856421..d4c039a 100644
index 3856421..6507155 100644
--- a/xbmc/interfaces/legacy/ModuleXbmc.cpp
+++ b/xbmc/interfaces/legacy/ModuleXbmc.cpp
@@ -337,6 +337,13 @@
@ -20,8 +20,8 @@ index 3856421..d4c039a 100644
+ void stopSFX()
+ {
+ XBMC_TRACE;
+ DelayedCallGuard dg;
+ g_audioManager.Stop();
+ g_audioManager.UnLoad();
+ }
+
void enableNavSounds(bool yesNo)
@ -35,54 +35,17 @@ index 9e04cfa..f26fa93 100644
void playSFX(const char* filename);
/**
+ * stopSFX() -- Stops wav file
+ *
+ * example:
+ * - xbmc.stopSFX()
+ */
+ void stopSFX();
+
+ /**
+ * stopSFX() -- Stops wav file
+ *
+ * example:
+ * - xbmc.stopSFX()
+ */
+ void stopSFX();
+
+ /**
* enableNavSounds(yesNo) -- Enables/Disables 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