Merge branch 'release/2.0'

# Conflicts:
#	Podfile.lock
#	Pods/Local Podspecs/SRGMediaPlayer.podspec.json
#	Pods/Manifest.lock
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/SDWebImage/SDWebImage/SDWebImageDownloader.m
#	Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.m
#	Pods/Target Support Files/SRGMediaPlayer/ResourceBundle-SRGMediaPlayer-Info.plist
#	README.md
#	RTSMediaPlayer/NSBundle+RTSMediaPlayer.h
#	RTSMediaPlayer/RTSMediaPlayerConstants.h
#	RTSMediaPlayer/RTSMediaPlayerController.h
#	RTSMediaPlayer/RTSMediaPlayerController.m
#	RTSMediaPlayer/RTSMediaPlayerPlaybackButton.m
#	RTSMediaPlayer/RTSPictureInPictureButton.m
#	RTSMediaPlayer/RTSTimeSlider.m
#	RTSMediaPlayer/RTSVolumeView.m
#	SRGMediaPlayer.podspec
#	SRGMediaPlayer.xcodeproj/project.pbxproj
#	publish_pod.sh

.gitignore

@@ -1 +1,7 @@
 docs
+Carthage/
+xcuserdata
+.DS_Store
+
+report.xml
+test_output

Cartfile

@@ -0,0 +1,3 @@
+github "SRGSSR/libextobjc" "076c968c9ade619ee836c89a935e09e6708d6ef2"
+github "SRGSSR/MAKVONotificationCenter" "4a127e52997889729286510103f7e27100223730"
+github "SRGSSR/srglogger-ios" "1.0"

Cartfile.resolved

@@ -0,0 +1,3 @@
+github "SRGSSR/MAKVONotificationCenter" "4a127e52997889729286510103f7e27100223730"
+github "SRGSSR/libextobjc" "076c968c9ade619ee836c89a935e09e6708d6ef2"
+github "SRGSSR/srglogger-ios" "1.0"

RTSMediaPlayer Demo/RTSMediaPlayer Demo/Supporting Files/Info.plist → Demo/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.2</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -31,8 +31,6 @@
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -50,7 +48,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
 </dict>
 </plist>

RTSMediaPlayer Demo/RTSMediaPlayer Demo/Resources/AudioURLs.plist → Demo/Resources/AudioURLs.plist

@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>Audios</key>
+	<key>Medias</key>
 	<array>
 		<dict>
 			<key>name</key>

RTSMediaPlayer Demo/RTSMediaPlayer Demo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json → Demo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
@@ -36,6 +46,16 @@
       "filename" : "[email protected]",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",

RTSMediaPlayer Demo/RTSMediaPlayer Demo/Storyboard/Base.lproj/LaunchScreen.xib → Demo/Resources/LaunchScreen.xib

@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,11 +12,9 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchImage.png" translatesAutoresizingMaskIntoConstraints="NO" id="5B4-x2-6zS">
-                    <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-                </imageView>
+                <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchImage.png" translatesAutoresizingMaskIntoConstraints="NO" id="5B4-x2-6zS"/>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="5B4-x2-6zS" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Irt-SF-BIg"/>
                 <constraint firstAttribute="trailing" secondItem="5B4-x2-6zS" secondAttribute="trailing" id="Wd8-fT-K0z"/>

RTSMediaPlayer Demo/RTSMediaPlayer Demo/Resources/MediaURLs.plist → Demo/Resources/MediaURLs.plist

@@ -2,13 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>Movies</key>
+	<key>Medias</key>
 	<array>
 		<dict>
 			<key>name</key>
-			<string>Eurosport FR</string>
+			<string>Euronews</string>
 			<key>url</key>
-			<string>http://esioslive6-i.akamaihd.net/hls/live/202892/AL_P_ESP1_FR_FRA/playlist.m3u8</string>
+			<string>http://fr-par-iphone-2.cdn.hexaglobe.net/streaming/euronews_ewns/9-live.m3u8</string>
 		</dict>
 		<dict>
 			<key>name</key>
@@ -40,6 +40,24 @@
 			<key>url</key>
 			<string>http://stream-i.rts.ch/i/bidbi/2007/bidbi_01082007-,450,k.mp4.csmil/master.m3u8</string>
 		</dict>
+		<dict>
+			<key>name</key>
+			<string>Short non-streamed video</string>
+			<key>url</key>
+			<string>http://www.sample-videos.com/video/mp4/720/big_buck_bunny_720p_1mb.mp4</string>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>SWI sample with strange behavior if seeking to the end (consistent between iOS and SRG players)</string>
+			<key>url</key>
+			<string>http://srgplayerswivod-vh.akamaihd.net/i/2016/09/13/,Hoechstgelegener_Windpark-42441158-360k,Hoechstgelegener_Windpark-42441158-720k,.mp4.csmil/master.m3u8</string>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>403 error</string>
+			<key>url</key>
+			<string>http://httpbin.org/status/403</string>
+		</dict>
 	</array>
 </dict>
 </plist>

Demo/Resources/MultiplayerURLs.plist

@@ -0,0 +1,21 @@
+<?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>Medias</key>
+	<array>
+		<dict>
+			<key>name</key>
+			<string>Live</string>
+			<key>url</key>
+			<string>https://wowza.jwplayer.com/live/jelly.stream/playlist.m3u8?DVR</string>
+			<key>secondaryUrls</key>
+			<array>
+				<string>https://wowza.jwplayer.com/live/jelly.stream/playlist.m3u8?DVR</string>
+				<string>https://wowza.jwplayer.com/live/jelly.stream/playlist.m3u8?DVR</string>
+				<string>http://fr-par-iphone-2.cdn.hexaglobe.net/streaming/euronews_ewns/9-live.m3u8</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>