Skip to content

Commit

Permalink
macfuncional
Browse files Browse the repository at this point in the history
  • Loading branch information
acrilique committed Dec 9, 2023
1 parent 0ebd754 commit 4ae7fc3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
8 changes: 4 additions & 4 deletions automarker.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@

CREATE_NO_WINDOW = 0x08000000
PREMIERE_PROCESS_NAME = "adobe premiere pro.exe" if WINDOWS_SYSTEM else "Adobe Premiere Pro"
AFTERFX_PROCESS_NAME = "AfterFX.exe" if WINDOWS_SYSTEM else "Adobe After Effects"
AFTERFX_PROCESS_NAME = "AfterFX.exe" if WINDOWS_SYSTEM else "After Effects"
RESOLVE_PROCESS_NAME = "Resolve.exe" if WINDOWS_SYSTEM else "Resolve"
BLENDER_PROCESS_NAME = "blender.exe" if WINDOWS_SYSTEM else "blender"
CEPPANEL_PROCESS_NAME = "CEPHtmlEngine.exe" if WINDOWS_SYSTEM else "CEPHtmlEngine"
Expand All @@ -92,11 +92,11 @@ def update_runvar():
global aeApp, prApp
if(is_premiere_running()[0]):
if (prApp==None):
prApp = PR_JSInterface(returnFolder = os.path.join(tempfile.gettempdir(), "AutoMarker"))
prApp = PR_JSInterface()
runvar.set("Premiere Pro is running!")
elif(is_afterfx_running()[0]):
if (aeApp==None):
aeApp = AE_JSInterface(returnFolder = os.path.join(tempfile.gettempdir(), "AutoMarker"))
aeApp = AE_JSInterface()
runvar.set("After Effects is running!")
elif(is_resolve_running()[0]):
runvar.set("Resolve is running!")
Expand Down Expand Up @@ -345,7 +345,7 @@ def _get_pids_from_name(process_name):
else:
# use pgrep UNIX command to filter processes by name
try:
output = subprocess.check_output(["pgrep", "-f", process_name])
output = subprocess.check_output(["pgrep", process_name])
except subprocess.CalledProcessError: # pgrep seems to crash if the given name is not a running process...
return list()
# parse output lines
Expand Down
9 changes: 4 additions & 5 deletions automarker_mac.spec
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ exe = EXE(
target_arch='x86_64',
codesign_identity='E9D38CA0B9FF902804EED51AAE0119CD2F0168E1',
entitlements_file='entitlements.plist',
icon='icon.png',
)
coll = COLLECT(
exe,
Expand All @@ -48,11 +47,11 @@ coll = COLLECT(
strip=False,
upx=True,
upx_exclude=[],
name='automarker',
name='AutoMarker',
)
app = BUNDLE(
coll,
name='automarker.app',
icon=None,
bundle_identifier=None,
name='AutoMarker.app',
icon='icon.png',
bundle_identifier='com.acrilique.automarker',
)

0 comments on commit 4ae7fc3

Please sign in to comment.