Mirrors/BackgroundMusic
2
0
Fork 0
mirror of https://github.com/kyleneideck/BackgroundMusic synced 2024-11-22 20:23:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

App Volumes: Fix the hardcoded HAL client process bundle IDs.

Browse source 
Fix the workaround for apps whose bundle IDs don't match their CoreAudio
clients. BGMBackgroundMusicDevice::ResponsibleBundleIDsOf was always
returning an empty list.

Also fix over-releasing the app's bundle ID CFString in
BGMAVM_VolumeSlider::appVolumeChanged and
BGMAVM_PanSlider::appPanPositionChanged.

Both bugs were introduced two commits ago in
e05acde351.
This commit is contained in:
Kyle Neideck 2017-08-06 22:38:39 +10:00
parent 02558cd275
commit 283db29fb4
No known key found for this signature in database
GPG key ID: CAA8D9B8E39EC18C
3 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BGMApp/BGMApp/BGMAppVolumes.mm
View file

@ -410,7 +410,7 @@ static CGFloat const kAppVolumeViewInitialHeight = 20;
// [kAppRelativeVolumeMinRawValue, kAppRelativeVolumeMaxRawValue] already.
context.audioDevices.bgmDevice.SetAppVolume(self.intValue,
appProcessID,
(__bridge CFStringRef)appBundleID);
(__bridge_retained CFStringRef)appBundleID);
}
@end
@ -456,7 +456,7 @@ static CGFloat const kAppVolumeViewInitialHeight = 20;
// The values from our sliders are in [kAppPanLeftRawValue, kAppPanRightRawValue] already.
context.audioDevices.bgmDevice.SetAppPanPosition(self.intValue,
appProcessID,
(__bridge CFStringRef)appBundleID);
(__bridge_retained CFStringRef)appBundleID);
}
@end

30
BGMApp/BGMApp/BGMBackgroundMusicDevice.cpp
View file

@ -185,10 +185,10 @@ void BGMBackgroundMusicDevice::SendAppVolumeOrPanToBGMDevice(SInt32 inNewValue,
addVolumeChange(inAppProcessID, inAppBundleID);
// Add the same change for each process the app is responsible for.
for(CFStringRef responsibleBundleID : ResponsibleBundleIDsOf(inAppBundleID))
for(CACFString responsibleBundleID : ResponsibleBundleIDsOf(CACFString(inAppBundleID)))
{
// Send -1 as the PID so this volume will only ever be matched by bundle ID.
addVolumeChange(-1, responsibleBundleID);
addVolumeChange(-1, responsibleBundleID.GetCFString());
}
CFPropertyListRef changesPList = appVolumeChanges.AsPropertyList();
@ -209,32 +209,32 @@ void BGMBackgroundMusicDevice::SendAppVolumeOrPanToBGMDevice(SInt32 inNewValue,
// this list if the API doesn't work.
//
// static
std::vector<CFStringRef>
BGMBackgroundMusicDevice::ResponsibleBundleIDsOf(CFStringRef inParentBundleID)
std::vector<CACFString>
BGMBackgroundMusicDevice::ResponsibleBundleIDsOf(CACFString inParentBundleID)
{
std::map<CFStringRef, std::vector<CFStringRef>> bundleIDMap = {
std::map<CACFString, std::vector<CACFString>> bundleIDMap = {
// Finder
{ CFSTR("com.apple.finder"), { CFSTR("com.apple.quicklook.ui.helper") } },
{ "com.apple.finder", { "com.apple.quicklook.ui.helper" } },
// Safari
{ CFSTR("com.apple.Safari"), { CFSTR("com.apple.WebKit.WebContent") } },
{ "com.apple.Safari", { "com.apple.WebKit.WebContent" } },
// Firefox
{ CFSTR("org.mozilla.firefox"), { CFSTR("org.mozilla.plugincontainer") } },
{ "org.mozilla.firefox", { "org.mozilla.plugincontainer" } },
// Firefox Nightly
{ CFSTR("org.mozilla.nightly"), { CFSTR("org.mozilla.plugincontainer") } },
{ "org.mozilla.nightly", { "org.mozilla.plugincontainer" } },
// VMWare Fusion
{ CFSTR("com.vmware.fusion"), { CFSTR("com.vmware.vmware-vmx") } },
{ "com.vmware.fusion", { "com.vmware.vmware-vmx" } },
// Parallels
{ CFSTR("com.parallels.desktop.console"), { CFSTR("com.parallels.vm") } },
{ "com.parallels.desktop.console", { "com.parallels.vm" } },
// MPlayer OSX Extended
{ CFSTR("hu.mplayerhq.mplayerosx.extended"),
{ CFSTR("ch.sttz.mplayerosx.extended.binaries.officialsvn") } }
{ "hu.mplayerhq.mplayerosx.extended",
{ "ch.sttz.mplayerosx.extended.binaries.officialsvn" } }
};
// Parallels' VM "dock helper" apps have bundle IDs like
// com.parallels.winapp.87f6bfc236d64d70a81c47f6243add4c.f5a25fdede514f7aa0a475a1873d3287.fs
if(CFStringHasPrefix(inParentBundleID, CFSTR("com.parallels.winapp.")))
if(inParentBundleID.StartsWith(CFSTR("com.parallels.winapp.")))
{
return { CFSTR("com.parallels.vm") };
return { "com.parallels.vm" };
}
return bundleIDMap[inParentBundleID];

7
BGMApp/BGMApp/BGMBackgroundMusicDevice.h
View file

@ -40,6 +40,9 @@
// Local Includes
#include "BGM_Types.h"
// PublicUtility Includes
#include "CACFString.h"
// STL Includes
#include <vector>
@ -123,8 +126,8 @@ private:
pid_t inAppProcessID,
CFStringRef inAppBundleID);
static std::vector<CFStringRef>
ResponsibleBundleIDsOf(CFStringRef inParentBundleID);
static std::vector<CACFString>
ResponsibleBundleIDsOf(CACFString inParentBundleID);
#pragma mark Audible State