Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions OSD/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>LSUIElement</key>
<true/>
<key>NSHighResolutionCapable</key>
<true/>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>
219 changes: 219 additions & 0 deletions Sources/CLI/main_cli.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
//
// main_cli.m
// volume-control-osd
//
// CLI entry point. Parses --volume <0-100>, --title <string>, and --position,
// shows the TahoeVolumeHUD on screen, then exits once the HUD has finished
// its fade-out animation.
//
// Usage:
// volume-control-osd --volume 42 --title "Bluesound"
// volume-control-osd --volume 75 --position top-right
// volume-control-osd --help
//

#import <Cocoa/Cocoa.h>
#import "TahoeVolumeHUD.h"

// ---------------------------------------------------------------------------
// Minimal PlayerApplication stand-in that carries only what TahoeVolumeHUD
// actually uses: icon (nil → no icon shown) and the numeric volume fields.
// ---------------------------------------------------------------------------
@interface CLIPlayerApplication : NSObject
@property (nonatomic, strong, nullable) NSImage *icon;
@property (nonatomic, assign) double currentVolume;
@property (nonatomic, assign) double oldVolume;
@property (nonatomic, assign) double doubleVolume;
- (BOOL)isRunning;
- (NSInteger)playerState;
@end

@implementation CLIPlayerApplication
- (BOOL)isRunning { return NO; }
- (NSInteger)playerState { return 0; }
@end

// ---------------------------------------------------------------------------
// Minimal app delegate – keeps NSApp alive just long enough for the HUD
// fade-in + hold + fade-out cycle, then quits cleanly.
// ---------------------------------------------------------------------------

// Total lifetime = fade-in (0.25 s) + hold (1.5 s) + fade-out (0.45 s) + margin
static const NSTimeInterval kTotalLifetime = 0.25 + 1.5 + 0.45 + 0.15;

@interface CLIAppDelegate : NSObject <NSApplicationDelegate>
@property (nonatomic, assign) double volume; // 0.0 – 1.0
@property (nonatomic, copy) NSString *title;
@property (nonatomic, assign) HUDPosition position;
@end

@implementation CLIAppDelegate

- (void)applicationDidFinishLaunching:(NSNotification *)notification {
// Show the HUD. Passing nil for the status button → centers on screen.
CLIPlayerApplication *player = [[CLIPlayerApplication alloc] init];
player.currentVolume = self.volume;
player.doubleVolume = self.volume;

[[TahoeVolumeHUD sharedManager] showHUDWithVolume:self.volume
usingMusicPlayer:(PlayerApplication *)player
andLabel:self.title
anchoredToStatusButton:nil
position:self.position];

// Schedule app termination after the full HUD lifecycle has elapsed.
[NSTimer scheduledTimerWithTimeInterval:kTotalLifetime
target:self
selector:@selector(quit)
userInfo:nil
repeats:NO];
}

- (void)quit {
[NSApp terminate:nil];
}

// Prevent the app from dying immediately if it has no windows.
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender {
return NO;
}

@end

// ---------------------------------------------------------------------------
// Helpers
// ---------------------------------------------------------------------------

static void printUsage(const char *progname) {
fprintf(stdout,
"Usage: %s --volume <0-100> [--title <string>] [--position <pos>]\n"
"\n"
"Options:\n"
" --volume <n> Volume level from 0 to 100 (required)\n"
" --title <s> Label shown in the HUD (default: \"Volume\")\n"
" --position <pos> Where to show the HUD (default: top-center)\n"
" top-left | top-center | top-right\n"
" center-left | center | center-right\n"
" bottom-left | bottom-center | bottom-right\n"
" --help Show this help message\n"
"\n"
"Example:\n"
" %s --volume 42 --title Bluesound --position top-right\n",
progname, progname);
}

static BOOL parsePosition(const char *str, HUDPosition *outPosition) {
NSString *s = [@(str) lowercaseString];
NSDictionary<NSString *, NSNumber *> *map = @{
@"top-left" : @(HUDPositionTopLeft),
@"top-center" : @(HUDPositionTopCenter),
@"top-right" : @(HUDPositionTopRight),
@"center-left" : @(HUDPositionCenterLeft),
@"center" : @(HUDPositionCenter),
@"center-right" : @(HUDPositionCenterRight),
@"bottom-left" : @(HUDPositionBottomLeft),
@"bottom-center" : @(HUDPositionBottomCenter),
@"bottom-right" : @(HUDPositionBottomRight),
};
NSNumber *val = map[s];
if (!val) return NO;
*outPosition = (HUDPosition)val.integerValue;
return YES;
}

// ---------------------------------------------------------------------------
// main
// ---------------------------------------------------------------------------

int main(int argc, char *argv[]) {
@autoreleasepool {

// ---- Parse arguments ----
double volume = -1.0;
NSString *title = @"Volume";
HUDPosition position = HUDPositionTopCenter;
BOOL gotVolume = NO;

for (int i = 1; i < argc; i++) {
NSString *arg = @(argv[i]);

if ([arg isEqualToString:@"--help"] || [arg isEqualToString:@"-h"]) {
printUsage(argv[0]);
return 0;
}

if ([arg isEqualToString:@"--volume"] || [arg isEqualToString:@"-v"]) {
if (i + 1 >= argc) {
fprintf(stderr, "error: --volume requires a numeric argument.\n");
printUsage(argv[0]);
return 1;
}
i++;
char *end = NULL;
double val = strtod(argv[i], &end);
if (end == argv[i] || *end != '\0') {
fprintf(stderr, "error: --volume value '%s' is not a number.\n", argv[i]);
return 1;
}
if (val < 0.0 || val > 100.0) {
fprintf(stderr, "error: --volume must be between 0 and 100 (got %.4g).\n", val);
return 1;
}
volume = val / 100.0; // normalise to 0-1
gotVolume = YES;
continue;
}

if ([arg isEqualToString:@"--title"] || [arg isEqualToString:@"-t"]) {
if (i + 1 >= argc) {
fprintf(stderr, "error: --title requires a string argument.\n");
printUsage(argv[0]);
return 1;
}
i++;
title = @(argv[i]);
continue;
}

if ([arg isEqualToString:@"--position"] || [arg isEqualToString:@"-p"]) {
if (i + 1 >= argc) {
fprintf(stderr, "error: --position requires a position argument.\n");
printUsage(argv[0]);
return 1;
}
i++;
if (!parsePosition(argv[i], &position)) {
fprintf(stderr, "error: unknown position '%s'.\n", argv[i]);
printUsage(argv[0]);
return 1;
}
continue;
}

fprintf(stderr, "error: unknown argument '%s'.\n", argv[i]);
printUsage(argv[0]);
return 1;
}

if (!gotVolume) {
fprintf(stderr, "error: --volume is required.\n");
printUsage(argv[0]);
return 1;
}

// ---- Bootstrap NSApplication ----
// We need a proper NSApplication run loop for AppKit UI (windows, animations).
// NSApplicationActivationPolicyAccessory keeps us off the Dock/menu bar.
NSApplication *app = [NSApplication sharedApplication];
[app setActivationPolicy:NSApplicationActivationPolicyAccessory];

CLIAppDelegate *delegate = [[CLIAppDelegate alloc] init];
delegate.volume = volume;
delegate.title = title;
delegate.position = position;
app.delegate = delegate;

[app run];
}
return 0;
}
6 changes: 3 additions & 3 deletions Sources/Controllers/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ - (void)MuteVol
if(!_hideVolumeWindow){
if (@available(macOS 16.0, *)) {
// On Tahoe, show the new popover HUD.
[[TahoeVolumeHUD sharedManager] showHUDWithVolume:0 usingMusicPlayer:runningPlayerPtr andLabel:[systemAudio getDefaultOutputDeviceName] anchoredToStatusButton:self.statusBar.button];
[[TahoeVolumeHUD sharedManager] showHUDWithVolume:0 usingMusicPlayer:runningPlayerPtr andLabel:[systemAudio getDefaultOutputDeviceName] anchoredToStatusButton:self.statusBar.button position:HUDPositionTopCenter];
} else {
// On older systems, use the classic OSD.
id osdMgr = [self->OSDManager sharedManager];
Expand All @@ -651,7 +651,7 @@ - (void)MuteVol
{
if (@available(macOS 16.0, *)) {
// On Tahoe, show the new popover HUD.
[[TahoeVolumeHUD sharedManager] showHUDWithVolume:[runningPlayerPtr oldVolume] usingMusicPlayer:runningPlayerPtr andLabel:[systemAudio getDefaultOutputDeviceName] anchoredToStatusButton:self.statusBar.button];
[[TahoeVolumeHUD sharedManager] showHUDWithVolume:[runningPlayerPtr oldVolume] usingMusicPlayer:runningPlayerPtr andLabel:[systemAudio getDefaultOutputDeviceName] anchoredToStatusButton:self.statusBar.button position:HUDPositionTopCenter];
} else {
// On older systems, use the classic OSD.
id osdMgr = [self->OSDManager sharedManager];
Expand Down Expand Up @@ -1185,7 +1185,7 @@ - (void)setVolumeUp:(bool)increase
{
if (@available(macOS 16.0, *)) {
// On Tahoe, show the new popover HUD anchored to the status item.
[[TahoeVolumeHUD sharedManager] showHUDWithVolume:volume usingMusicPlayer:runningPlayerPtr andLabel:[systemAudio getDefaultOutputDeviceName] anchoredToStatusButton:self.statusBar.button];
[[TahoeVolumeHUD sharedManager] showHUDWithVolume:volume usingMusicPlayer:runningPlayerPtr andLabel:[systemAudio getDefaultOutputDeviceName] anchoredToStatusButton:self.statusBar.button position:HUDPositionTopCenter];
} else {
if(image) {
id osdMgr = [self->OSDManager sharedManager];
Expand Down
17 changes: 16 additions & 1 deletion User interface/HUD/TahoeVolumeHUD.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
@class TahoeVolumeHUD;
@class PlayerApplication;

/// Where to place the HUD on screen when not anchored to a status-bar button.
/// The nine values form a 3×3 grid; the default is TopCenter (below the menu bar).
typedef NS_ENUM(NSInteger, HUDPosition) {
HUDPositionTopLeft = 0,
HUDPositionTopCenter = 1,
HUDPositionTopRight = 2,
HUDPositionCenterLeft = 3,
HUDPositionCenter = 4,
HUDPositionCenterRight = 5,
HUDPositionBottomLeft = 6,
HUDPositionBottomCenter = 7,
HUDPositionBottomRight = 8,
};

NS_ASSUME_NONNULL_BEGIN

@protocol TahoeVolumeHUDDelegate <NSObject>
Expand All @@ -30,7 +44,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (weak, nonatomic, nullable) id<TahoeVolumeHUDDelegate> delegate;

/// Show/update the HUD under a status bar button. `volume` is 0.0–1.0 (or 0–100; both accepted).
- (void)showHUDWithVolume:(double)volume usingMusicPlayer:(PlayerApplication*)controlledPlayer andLabel:(NSString*)label anchoredToStatusButton:(NSStatusBarButton *)button;
/// When `button` is nil the HUD is placed on screen according to `position`.
- (void)showHUDWithVolume:(double)volume usingMusicPlayer:(nullable PlayerApplication*)controlledPlayer andLabel:(NSString*)label anchoredToStatusButton:(nullable NSStatusBarButton *)button position:(HUDPosition)position;

/// Programmatically hide it immediately.
- (void)hide;
Expand Down
Loading