Skip to content
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

Hello, macOS 👋 (& system-supplied playback controls) #181

Open
wants to merge 62 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
17039f3
Add support for using AVPlayerViewController to have access to the na…
addbrick Apr 3, 2018
bcdd882
add error call to delegate following https://github.com/piemonte/Play…
addbrick Apr 3, 2018
c896803
more consolidation
addbrick Apr 3, 2018
1e653f0
add playback error delegate call in example
addbrick Apr 3, 2018
e7c0eda
don't pause on viewDidDisappear
addbrick Apr 3, 2018
8d3c51e
use custom AVPlayerViewController which allows auto rotate
addbrick Apr 3, 2018
3b507db
more consolidation
addbrick Apr 3, 2018
f8759f7
better implementation of using AVPlayerViewController and add an opti…
addbrick Apr 3, 2018
8de0434
remove setting _nativePlayerViewController in init since it gets crea…
addbrick Apr 10, 2018
4946613
remove class which isn't used
addbrick Apr 10, 2018
664d56d
update use of AVLayerVideoGravity key
addbrick Apr 10, 2018
e55726c
update how completion handler is called for seek on _playerItem
addbrick Apr 10, 2018
65db412
Add observer for AVPlayer.timeControlStatus to update the status when…
addbrick Apr 10, 2018
e3ad035
Revert "update use of AVLayerVideoGravity key"
addbrick Apr 10, 2018
a3fb648
update target to be iOS 10.0
addbrick Apr 10, 2018
ce0341a
fill CURRENT_PROJECT_VERSION
addbrick Apr 10, 2018
5c15581
Add macOS target, refactor, clean, etc. 🔥
chriszielinski Jun 19, 2018
6f1a9a5
Add Carthage support
chriszielinski Jun 19, 2018
ceb3d9d
Fix build settings, update demos
chriszielinski Jun 19, 2018
25255e1
Make delegate methods optional
chriszielinski Jun 20, 2018
ce8de69
Refactor enum to better fit Swift nomenclature
chriszielinski Jun 20, 2018
f9001d0
Update readme
chriszielinski Jun 20, 2018
4520c13
Refactor FillMode (again), add convenience method for adding player t…
chriszielinski Jun 20, 2018
b221af8
Update podspec
chriszielinski Jun 20, 2018
ad1136b
Correct readme
chriszielinski Jun 20, 2018
a7c7e96
Update readme, remove force unwrapping in demos
chriszielinski Jun 20, 2018
c3b1276
Add SwiftLint
chriszielinski Jun 20, 2018
8df8877
Update documentation, maybe something else too
chriszielinski Jun 20, 2018
3a7a177
Merged PR #180
chriszielinski Jun 21, 2018
dc8326a
Remove swift pm as there is no suport for iOS/tvOS/macOS targets
chriszielinski Jun 21, 2018
1c04c1b
Fix macOS target
chriszielinski Jun 21, 2018
6089ae8
Add rakefile
chriszielinski Jun 21, 2018
cd7c33f
Add swiftlint config file
chriszielinski Jun 21, 2018
5c917db
Update podfile
chriszielinski Jun 21, 2018
c3e364e
Add missing brace to rakefile
chriszielinski Jun 21, 2018
7cc4b8d
Update rakefile, make swiftlint happy
chriszielinski Jun 21, 2018
9f299a0
Merge branch 'master' of https://github.com/chriszielinski/Player
chriszielinski Jun 21, 2018
1dbadbb
Remove code signing for travis builds
chriszielinski Jun 21, 2018
f303e77
Clean up travis scripts
chriszielinski Jun 21, 2018
a1e5bb5
Add , some more refactoring, update readme
chriszielinski Jun 22, 2018
f33fdfb
Update README.md
chriszielinski Jun 22, 2018
88809ee
Update readme
chriszielinski Jun 22, 2018
449df5c
Update readme
chriszielinski Jun 22, 2018
fb5cd5e
Update documentation
chriszielinski Jun 22, 2018
4e98b3c
Add a few macOS test cases
chriszielinski Jun 22, 2018
71b7422
Why
chriszielinski Jun 22, 2018
f29a715
please
chriszielinski Jun 22, 2018
1376333
Remove xcpretty from test
chriszielinski Jun 22, 2018
c388c16
🤬
chriszielinski Jun 22, 2018
afe3c09
About to quit
chriszielinski Jun 22, 2018
469f549
Remove fast_finish
chriszielinski Jun 22, 2018
3d5bd94
Add (try) iOS tests
chriszielinski Jun 22, 2018
d1a1e85
Add iOS test target to travis
chriszielinski Jun 22, 2018
135ecdc
Remove audio from test mp4
chriszielinski Jun 22, 2018
958eb12
Tests should (better) pass now
chriszielinski Jun 22, 2018
648f44a
Add tvOS tests, remove print statements, other debug stuff
chriszielinski Jun 22, 2018
2ab959f
Conditional SwiftLint run script
chriszielinski Jun 22, 2018
af76e2d
Disable 'Show environment variables in build log', add xcpretty to ra…
chriszielinski Jun 22, 2018
0bee617
Add public computed property.
chriszielinski Jun 23, 2018
8231bd5
Add view parameter to add(to:view:)
chriszielinski Jun 23, 2018
a3c1144
Make adding player to view hierarchy optional
chriszielinski Jun 23, 2018
660f14f
Update to Swift 5
chriszielinski Apr 21, 2021
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
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
4.1
13 changes: 13 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
included:
- Sources
- Project

excluded:
- Carthage
- Project/Tests

disabled_rules:
- file_length
- type_body_length

function_body_length: 60
33 changes: 26 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
language: objective-c
osx_image: xcode9.1
osx_image: xcode9.4
xcode_workspace: Player.xcworkspace
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- IOS_SDK=iphonesimulator11.1
- TVOS_SDK=appletvsimulator11.1
script:
- xcodebuild -showsdks
- xcodebuild -project Project/Player.xcodeproj -scheme 'Debug - iOS' -sdk $IOS_SDK build analyze
# - xcodebuild -project Project/Player.xcodeproj -scheme 'Debug - tvOS' -sdk $TVOS_SDK build analyze
- CONFIG=Release
- XCCONFIG=Project/Shared/Travis.xcconfig
matrix:
include:
- env:
ACTION=test:macos
SDK=macosx10.13
install:
- gem install xcpretty
- env:
ACTION=test:ios
SDK=iphonesimulator11.4
install:
- gem install xcpretty
- env:
ACTION=test:tvos
SDK=appletvsimulator11.4
install:
- gem install xcpretty
- env: ACTION=build:carthage
- env: ACTION=build:pod
- env: ACTION=swiftlint
fast_finish: true
script: rake "$ACTION"
5 changes: 0 additions & 5 deletions Package.swift

This file was deleted.

Binary file removed Player.gif
Binary file not shown.
11 changes: 6 additions & 5 deletions Player.podspec
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
Pod::Spec.new do |s|
s.name = 'Player'
s.version = '0.8.4'
s.version = '0.9'
s.license = 'MIT'
s.summary = 'video player in Swift, simple way to play and stream media in your iOS or tvOS app'
s.summary = '▶️ A Swift Video Player: A simple way to play and stream media on iOS/tvOS/macOS'
s.homepage = 'https://github.com/piemonte/player'
s.social_media_url = 'http://twitter.com/piemonte'
s.authors = { 'patrick piemonte' => "[email protected]" }
s.social_media_url = 'https://twitter.com/piemonte'
s.authors = { 'patrick piemonte' => "[email protected]", 'chris zielinski' => "[email protected]" }
s.source = { :git => 'https://github.com/piemonte/player.git', :tag => s.version }
s.ios.deployment_target = '9.0'
s.tvos.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.source_files = 'Sources/*.swift'
s.requires_arc = true
s.swift_version = '4.0'
s.swift_version = '4.1'
# s.screenshot = "https://raw.github.com/piemonte/Player/master/Player.gif"
end
8 changes: 8 additions & 0 deletions Player.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
5 changes: 5 additions & 0 deletions Player.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?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/>
</plist>
921 changes: 844 additions & 77 deletions Project/Player.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?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/>
</plist>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -15,22 +15,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "065A0F9C1A25C8E2005BA7BC"
BuildableName = "Player_iOS.app"
BlueprintName = "Player_iOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "065A0FB11A25C8E2005BA7BC"
BuildableName = "PlayerTests.xctest"
BlueprintName = "PlayerTests"
BuildableName = "Player iOS.app"
BlueprintName = "Player iOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -40,37 +26,33 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "065A0F9C1A25C8E2005BA7BC"
BuildableName = "Player iOS.app"
BlueprintName = "Player iOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "065A0FB11A25C8E2005BA7BC"
BuildableName = "PlayerTests.xctest"
BlueprintName = "PlayerTests"
BlueprintIdentifier = "14F9E20520DD938D008D7CB2"
BuildableName = "PlayerTests iOS.xctest"
BlueprintName = "PlayerTests iOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "065A0F9C1A25C8E2005BA7BC"
BuildableName = "Player_iOS.app"
BlueprintName = "Player_iOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand All @@ -82,13 +64,11 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "065A0F9C1A25C8E2005BA7BC"
BuildableName = "Player_iOS.app"
BlueprintName = "Player_iOS"
BuildableName = "Player iOS.app"
BlueprintName = "Player iOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand All @@ -101,8 +81,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "065A0F9C1A25C8E2005BA7BC"
BuildableName = "Player_iOS.app"
BlueprintName = "Player_iOS"
BuildableName = "Player iOS.app"
BlueprintName = "Player iOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
Expand Down
107 changes: 107 additions & 0 deletions Project/Player.xcodeproj/xcshareddata/xcschemes/Debug - macOS.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "848DE8D520D86AEB000807C4"
BuildableName = "Player macOS.app"
BlueprintName = "Player macOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "848DE8D520D86AEB000807C4"
BuildableName = "Player macOS.app"
BlueprintName = "Player macOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8491C30620DC36EE0057A7C4"
BuildableName = "Player Tests macOS.xctest"
BlueprintName = "Player Tests macOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "14F9E1F220DD5259008D7CB2"
BuildableName = "PlayerTests macOS.xctest"
BlueprintName = "PlayerTests macOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "848DE8D520D86AEB000807C4"
BuildableName = "Player macOS.app"
BlueprintName = "Player macOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "848DE8D520D86AEB000807C4"
BuildableName = "Player macOS.app"
BlueprintName = "Player macOS"
ReferencedContainer = "container:Player.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading