Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
C
cog
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
If you have an issue with any of our projects. feel free to register.
Open sidebar
Christopher Snowhill
cog
Commits
0a99093a
Commit
0a99093a
authored
Jan 06, 2021
by
Christopher Snowhill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix status bar bodge so stopping manually doesn't prevent playback for 3 seconds
parent
41d11bdf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
Application/AppController.m
Application/AppController.m
+3
-0
Application/PlaybackController.m
Application/PlaybackController.m
+2
-2
Playlist/PlaylistView.m
Playlist/PlaylistView.m
+1
-1
No files found.
Application/AppController.m
View file @
0a99093a
...
...
@@ -241,6 +241,9 @@
int
lastTrackPlaying
=
-
1
;
double
lastTrackPosition
=
0
;
if
(
currentStatus
==
kCogStatusStopping
)
currentStatus
=
kCogStatusStopped
;
[[
NSUserDefaults
standardUserDefaults
]
setInteger
:
currentStatus
forKey
:
@"lastPlaybackStatus"
];
if
(
currentStatus
!=
kCogStatusStopped
)
...
...
Application/PlaybackController.m
View file @
0a99093a
...
...
@@ -73,7 +73,7 @@ NSString *CogPlaybackDidStopNotficiation = @"CogPlaybackDidStopNotficiation";
-
(
IBAction
)
playPauseResume
:(
id
)
sender
{
if
(
playbackStatus
==
kCogStatusStopped
)
if
(
playbackStatus
==
kCogStatusStopped
||
playbackStatus
==
kCogStatusStopping
)
{
[
self
play
:
self
];
}
...
...
@@ -160,7 +160,7 @@ NSDictionary * makeRGInfo(PlaylistEntry *pe)
-
(
void
)
playEntry
:(
PlaylistEntry
*
)
pe
startPaused
:(
BOOL
)
paused
{
if
(
playbackStatus
!=
kCogStatusStopped
)
if
(
playbackStatus
!=
kCogStatusStopped
&&
playbackStatus
!=
kCogStatusStopping
)
[
self
stop
:
self
];
DLog
(
@"PLAYLIST CONTROLLER: %@"
,
[
playlistController
class
]);
...
...
Playlist/PlaylistView.m
View file @
0a99093a
...
...
@@ -389,7 +389,7 @@
return
NO
;
}
if
(
action
==
@selector
(
scrollToCurrentEntry
:
)
&&
(
[
playbackController
playbackStatus
]
==
kCogStatusStopped
))
if
(
action
==
@selector
(
scrollToCurrentEntry
:
)
&&
(
([
playbackController
playbackStatus
]
==
kCogStatusStopped
)
||
([
playbackController
playbackStatus
]
==
kCogStatusStopping
)
))
return
NO
;
return
[
super
validateUserInterfaceItem
:
anItem
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment