-
Notifications
You must be signed in to change notification settings - Fork 141
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
MusicAppMediaFix: support multiple (user-specified) media apps #302
Draft
brechtm
wants to merge
2
commits into
Hammerspoon:master
Choose a base branch
from
brechtm:multi-app-media-fix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
--- === MusicAppMediaFix === | ||
--- | ||
--- Override macOS behaviour and send all media keys (play/prev/next) to Music.app | ||
--- Override macOS behaviour and send all media keys (play/prev/next) to | ||
--- the last active of a specified list of apps in MusicAppMediaFix.mediaApps | ||
local obj = { __gc = true } | ||
--obj.__index = obj | ||
setmetatable(obj, obj) | ||
|
@@ -16,6 +17,9 @@ obj.homepage = "https://github.com/Hammerspoon/Spoons" | |
obj.license = "MIT - https://opensource.org/licenses/MIT" | ||
|
||
obj.eventtap = nil | ||
obj.appWatcher = nil | ||
obj.mediaApps = {"Music"} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should really have a docstring and be notated as a Variable. |
||
obj.currentApp = nil | ||
|
||
-- Internal function used to find our location, so we know where to load files from | ||
local function script_path() | ||
|
@@ -25,7 +29,9 @@ end | |
obj.spoonPath = script_path() | ||
|
||
function obj:init() | ||
self.currentApp = self.mediaApps[1] | ||
self.eventtap = hs.eventtap.new({hs.eventtap.event.types.systemDefined}, self.mediaKeyCallback) | ||
self.appWatcher = hs.application.watcher.new(self.appWatcherCallback) | ||
end | ||
|
||
function obj.mediaKeyCallback(event) | ||
|
@@ -38,19 +44,32 @@ function obj.mediaKeyCallback(event) | |
|
||
-- handle action | ||
if data["down"] == false or data["repeat"] == true then | ||
for i, app in pairs(obj.mediaApps) do | ||
if app ~= obj.currentApp then | ||
hs.osascript.applescript('tell application "' .. app .. '" to pause') | ||
end | ||
end | ||
if data["key"] == "PLAY" then | ||
hs.applescript('tell application "Music" to playpause') | ||
hs.applescript('tell application "' .. obj.currentApp .. '" to playpause') | ||
elseif data["key"] == "FAST" then | ||
hs.applescript('tell application "Music" to next track') | ||
hs.applescript('tell application "' .. obj.currentApp .. '" to next track') | ||
elseif data["key"] == "REWIND" then | ||
hs.applescript('tell application "Music" to previous track') | ||
hs.applescript('tell application "' .. obj.currentApp .. '" to previous track') | ||
end | ||
end | ||
|
||
-- consume event | ||
return true, nil | ||
end | ||
|
||
function obj.appWatcherCallback(appName, eventType, app) | ||
if hs.fnutils.contains(obj.mediaApps, appName) | ||
and (eventType == hs.application.watcher.activated) then | ||
obj.currentApp = appName | ||
print("Sending media key events to " .. appName) | ||
end | ||
end | ||
|
||
--- MusicAppMediaFix:start() | ||
--- Method | ||
--- Starts the hs.eventtap that powers this Spoon | ||
|
@@ -64,6 +83,7 @@ function obj:start() | |
if self.eventtap:isEnabled() ~= true then | ||
self.eventtap:start() | ||
end | ||
self.appWatcher:start() | ||
return self | ||
end | ||
|
||
|
@@ -80,6 +100,7 @@ function obj:stop() | |
if self.eventtap:isEnabled() then | ||
self.eventtap:stop() | ||
end | ||
self.appWatcher:stop() | ||
return self | ||
end | ||
|
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would remove
in MusicAppMediaFix.mediaApps
from this docstring, given the comment below.