Skip to content

Alarm: add Dismiss option to Jive alarm popup #1564

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.

Sign up for GitHub

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

Open
boudekerk wants to merge 1 commit into
base: public/9.2
Choose a base branch
from
+42 −34
Open

Alarm: add Dismiss option to Jive alarm popup #1564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions Slim/Control/Jive.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2462,18 +2462,19 @@ sub jiveAlarmCommand {
my $request = shift;
my $client = $request->client || return;

# this command can issue either a snooze or a cancel
my $snooze = $request->getParam('snooze') ? 1 : undef;
my $stop = $request->getParam('stop') ? 1 : undef;
my $fadein = $request->getParam('fadein');
# this command can issue either a snooze or a stop
my $snooze = $request->getParam('snooze') ? 1 : undef;
my $stop = $request->getParam('stop') ? 1 : undef;
my $continueAudio = $request->getParam('continueAudio') ? 1 : 0;
my $fadein = $request->getParam('fadein');

my $alarm = Slim::Utils::Alarm->getCurrentAlarm($client);

if ( defined($alarm) ) {
if ( defined($snooze) ) {
$alarm->snooze();
} elsif ( defined ($stop) ) {
$alarm->stop();
$alarm->stop($continueAudio);
}
}

Expand Down
65 changes: 36 additions & 29 deletions Slim/Utils/Alarm.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,14 +844,19 @@ sub stopSnooze {

=head3

stop( )
stop( [ $continueAudio ] )

Stops this alarm. Has no effect if the alarm is not sounding.

If $continueAudio is true, the player's playback, volume, power, and shuffle
state are left untouched — the alarm UI is dismissed without interrupting what
is playing. Defaults to false (full restore).

=cut

sub stop {
my $self = shift;
my $continueAudio = shift;

my $client = $self->client;

Expand All @@ -877,37 +882,39 @@ sub stop {
$self->{_timeoutTimer} = undef;
}

# Restore analogOutMode to previous setting
if ($client->can('setAnalogOutMode') && $client->can('lineOutConnected')
&& $client->lineOutConnected()) {
# Restore in a second in order to avoid a blip that can occur if setAnalogOutMode
# is called during a power off volume fade. Bug 9093.
Slim::Utils::Timers::setTimer($self, Time::HiRes::time() + 1, sub {
main::DEBUGLOG && $isDebug && $log->debug('Restoring previous line out mode');
$client->setAnalogOutMode();
});
}

# Restore original volume if the music is stopped at the end of the alarm and
# the volume hasn't been changed from the alarm volume level. Do this after a pause
# to allow any volume fades to complete.
Slim::Utils::Timers::setTimer($self, Time::HiRes::time() + 1, sub {
# Get volume level directly via the pref as we don't care about temporary
# volume levels (vol is reported as 0 after a mute)
my $vol = $prefs->client($client)->get('volume');
if (! $client->isPlaying && $vol == $self->volume) {
main::DEBUGLOG && $isDebug && $log->debug('Restoring pre-alarm volume level: ' . $self->{_originalVolume});
$client->volume($self->{_originalVolume});
if (!$continueAudio) {
# Restore analogOutMode to previous setting
if ($client->can('setAnalogOutMode') && $client->can('lineOutConnected')
&& $client->lineOutConnected()) {
# Restore in a second in order to avoid a blip that can occur if setAnalogOutMode
# is called during a power off volume fade. Bug 9093.
Slim::Utils::Timers::setTimer($self, Time::HiRes::time() + 1, sub {
main::DEBUGLOG && $isDebug && $log->debug('Restoring previous line out mode');
$client->setAnalogOutMode();
});
}

# Restore client shuffle mode
main::DEBUGLOG && $isDebug && $log->debug('Restoring pre-alarm shuffle mode: ' . $self->{_originalShuffleMode});
$client->execute(['playlist', 'shuffle', $self->{_originalShuffleMode}]);
# Restore original volume if the music is stopped at the end of the alarm and
# the volume hasn't been changed from the alarm volume level. Do this after a pause
# to allow any volume fades to complete.
Slim::Utils::Timers::setTimer($self, Time::HiRes::time() + 1, sub {
# Get volume level directly via the pref as we don't care about temporary
# volume levels (vol is reported as 0 after a mute)
my $vol = $prefs->client($client)->get('volume');
if (! $client->isPlaying && $vol == $self->volume) {
main::DEBUGLOG && $isDebug && $log->debug('Restoring pre-alarm volume level: ' . $self->{_originalVolume});
$client->volume($self->{_originalVolume});
}

# Bug: 12760, 9569 - Return power state to that prior to the alarm
main::DEBUGLOG && $isDebug && $log->debug('Restoring pre-alarm power state: ' . ($self->{_originalPower} ? 'on' : 'off'));
$client->power($self->{_originalPower});
});
# Restore client shuffle mode
main::DEBUGLOG && $isDebug && $log->debug('Restoring pre-alarm shuffle mode: ' . $self->{_originalShuffleMode});
$client->execute(['playlist', 'shuffle', $self->{_originalShuffleMode}]);

# Bug: 12760, 9569 - Return power state to that prior to the alarm
main::DEBUGLOG && $isDebug && $log->debug('Restoring pre-alarm power state: ' . ($self->{_originalPower} ? 'on' : 'off'));
$client->power($self->{_originalPower});
});
}


my $class = ref $self;
Expand Down