Skip to content
This repository has been archived by the owner on Aug 26, 2021. It is now read-only.

v6.0.2 > Master #47

Merged
merged 19 commits into from
Apr 1, 2016
Merged

v6.0.2 > Master #47

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0d031c0
adding example
Mar 10, 2016
7ef2d71
adding workspace
Mar 10, 2016
bb3277d
naming
Mar 10, 2016
9c34e65
new video
Mar 10, 2016
19b5797
Merge pull request #42 from vimeo/v6.0.1
huebnerob Mar 16, 2016
1c7720f
readme
Mar 21, 2016
d908925
more readme
Mar 21, 2016
d4446bc
more readme
Mar 21, 2016
1adc511
Merge pull request #43 from vimeo/example
ghking Mar 21, 2016
684adc0
name change
Mar 23, 2016
cc3bce9
Merge pull request #44 from vimeo/nameChange
ghking Mar 23, 2016
55bbd0e
changed project setup to include framework
alfiehanssen Mar 24, 2016
a4bb460
renamed example project
alfiehanssen Mar 24, 2016
991fa26
podspec update
alfiehanssen Mar 24, 2016
46aa54e
Merge pull request #46 from vimeo/framework
alfiehanssen Mar 29, 2016
208c5ba
Update README.md
alfiehanssen Apr 1, 2016
5b3d267
Update README.md
alfiehanssen Apr 1, 2016
4e5c677
Update LICENSE.md
alfiehanssen Apr 1, 2016
1e2843b
Update LICENSE.md
alfiehanssen Apr 1, 2016
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
Prev Previous commit
Next Next commit
naming
  • Loading branch information
Gavin King committed Mar 10, 2016
commit bb3277d25ecc8e9fba44d679ba61905612db4f84
16 changes: 8 additions & 8 deletions Example/VIMVideoPlayer-iOS-Example/VIMVideoPlayer-iOS-Example/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ViewController: UIViewController, VIMVideoPlayerViewDelegate
@IBOutlet weak var slider: UISlider!

private var isScrubbing = false

override func viewDidLoad()
{
super.viewDidLoad()
Expand All @@ -23,14 +23,14 @@ class ViewController: UIViewController, VIMVideoPlayerViewDelegate
self.setupSlider()
}

// MARK: VIMVideoPlayerViewDelegate

// MARK: Setup
private func setupVideoPlayerView()
{
self.videoPlayerView.player.looping = true
self.videoPlayerView.player.disableAirplay()
self.videoPlayerView.setVideoFillMode(AVLayerVideoGravityResizeAspectFill)

self.videoPlayerView.delegate = self

if let path = NSBundle.mainBundle().pathForResource("field", ofType: "mp4")
Expand Down Expand Up @@ -64,7 +64,7 @@ class ViewController: UIViewController, VIMVideoPlayerViewDelegate
else
{
sender.selected = false

self.videoPlayerView.player.play()
}
}
Expand Down Expand Up @@ -113,9 +113,9 @@ class ViewController: UIViewController, VIMVideoPlayerViewDelegate
return
}

let totalTimeInSeconds = Float(CMTimeGetSeconds(duration))
let currentTimeInSeconds = Float(CMTimeGetSeconds(cmTime))
let durationInSeconds = Float(CMTimeGetSeconds(duration))
let timeInSeconds = Float(CMTimeGetSeconds(cmTime))

self.slider.value = currentTimeInSeconds / totalTimeInSeconds
self.slider.value = timeInSeconds / durationInSeconds
}
}