Merge branch 'release/7.0.0'

.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme

@@ -72,6 +72,9 @@
                <Test
                   Identifier = "PlaybackTestCase/testOnDemandPlaybackStartAtTimeWithTolerances">
                </Test>
+               <Test
+                  Identifier = "SegmentsTestCase/testPlaySelectedSegmentAtStreamEnd">
+               </Test>
                <Test
                   Identifier = "SegmentsTestCase/testStartTimeAroundBeginningOfSegmentWithSelection">
                </Test>

Demo/Demo.xcconfig

@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 6.2.2
+MARKETING_VERSION = 7.0.0
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 9.0

Demo/Resources/Data/MultiPlayerDemoConfiguration.plist

@@ -20,7 +20,7 @@
 			<key>name</key>
 			<string>Gothard 360</string>
 			<key>url</key>
-			<string>https://rtsvodww-vh.akamaihd.net/i/360/2017/2_Gothard_360_full_f_8414077-,301k,701k,1201k,2001k,.mp4.csmil/master.m3u8</string>
+			<string>https://rts-vod-amd.akamaized.net/ww/8414077/78880679-f000-3e61-a636-5186eb5d8e10/master.m3u8</string>
 			<key>is360</key>
 			<true/>
 		</dict>

Demo/Resources/Data/SegmentDemoConfiguration.plist

@@ -134,6 +134,44 @@
 				</dict>
 			</array>
 		</dict>
+		<dict>
+			<key>name</key>
+			<string>Segment at end</string>
+			<key>url</key>
+			<string>https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8</string>
+			<key>segments</key>
+			<array>
+				<dict>
+					<key>name</key>
+					<string>Segment #0</string>
+					<key>startTime</key>
+					<integer>1795045</integer>
+					<key>duration</key>
+					<integer>5000</integer>
+					<key>blocked</key>
+					<false/>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Blocked segment at end</string>
+			<key>url</key>
+			<string>https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8</string>
+			<key>segments</key>
+			<array>
+				<dict>
+					<key>name</key>
+					<string>Segment #0</string>
+					<key>startTime</key>
+					<integer>1795045</integer>
+					<key>duration</key>
+					<integer>5000</integer>
+					<key>blocked</key>
+					<true/>
+				</dict>
+			</array>
+		</dict>
 		<dict>
 			<key>name</key>
 			<string>Five consecutive segments</string>

Demo/Resources/Data/VideoDemoConfiguration.plist

@@ -68,7 +68,7 @@
 			<key>name</key>
 			<string>Gothard 360° video</string>
 			<key>url</key>
-			<string>https://rts-vod-amd.akamaized.net/ww/hls/8414077/f66334a7-1bdb-3690-b91a-29f6c258e1cb/master.m3u8</string>
+			<string>https://rts-vod-amd.akamaized.net/ww/8414077/78880679-f000-3e61-a636-5186eb5d8e10/master.m3u8</string>
 			<key>is360</key>
 			<true/>
 		</dict>

Demo/Sources/Players/Advanced/AdvancedPlayerViewController~ios.m

@@ -20,7 +20,7 @@
 // To keep the view controller when picture in picture is active
 static AdvancedPlayerViewController *s_advancedPlayerViewController;
 
-@interface AdvancedPlayerViewController () <AVPictureInPictureControllerDelegate, SRGTracksButtonDelegate, UIViewControllerTransitioningDelegate>
+@interface AdvancedPlayerViewController () <AVPictureInPictureControllerDelegate, SRGPlaybackSettingsButtonDelegate, UIViewControllerTransitioningDelegate>
 
 @property (nonatomic) Media *media;
 
@@ -494,14 +494,14 @@ - (void)pictureInPictureControllerDidStopPictureInPicture:(AVPictureInPictureCon
     self.restorationWindow = nil;
 }
 
-#pragma mark SRGTracksButtonDelegate protocol
+#pragma mark SRGPlaybackSettingsButtonDelegate protocol
 
-- (void)tracksButtonWillShowTrackSelection:(SRGTracksButton *)tracksButton
+- (void)playbackSettingsButtonWillShowSettings:(SRGPlaybackSettingsButton *)playbackSettingsButton
 {
     [self stopInactivityTracker];
 }
 
-- (void)tracksButtonDidHideTrackSelection:(SRGTracksButton *)tracksButton
+- (void)playbackSettingsButtonDidHideSettings:(SRGPlaybackSettingsButton *)playbackSettingsButton
 {
     [self restartInactivityTracker];
 }

Demo/Sources/Players/Advanced/AdvancedPlayerViewController~ios.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="d9c-I7-8ft">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="d9c-I7-8ft">
     <device id="retina6_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,11 +17,11 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="error" translatesAutoresizingMaskIntoConstraints="NO" id="Nio-gG-HwI" userLabel="Error Image View">
-                                <rect key="frame" x="157" y="398" width="100" height="100"/>
+                                <rect key="frame" x="132" y="373" width="150" height="150"/>
                                 <color key="tintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="audio_only" translatesAutoresizingMaskIntoConstraints="NO" id="2kU-EO-gil" userLabel="Audio Only Image View">
-                                <rect key="frame" x="135.33333333333331" y="398" width="143.33333333333331" height="100"/>
+                                <rect key="frame" x="99.666666666666686" y="373" width="215" height="150"/>
                                 <color key="tintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CjI-bJ-s74" customClass="SRGMediaPlayerView">
@@ -166,7 +166,7 @@
                                     <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="omh-tb-D23">
                                         <rect key="frame" x="10" y="28.666666666666629" width="20" height="20"/>
                                     </activityIndicatorView>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xRb-AE-54i" customClass="SRGTracksButton">
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xRb-AE-54i" customClass="SRGPlaybackSettingsButton">
                                         <rect key="frame" x="361" y="50.666666666666629" width="25" height="25"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <color key="tintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

Designables/SRGMediaPlayerDesignables.m

@@ -11,7 +11,7 @@
  *
  *  Copy this file into your project, do not include it directly or use a symbolic link to it, it won't work.
  *  Using designables will trigger additional background compilations, this is normal. If your project takes
- *  too long to compile, Kyou might not want to opt-in for designables.
+ *  too long to compile, you might not want to opt-in for designables.
  */
 
 IB_DESIGNABLE
@@ -35,17 +35,17 @@ @interface SRGPlaybackButton (Designable)
 @end
 
 IB_DESIGNABLE
-@interface SRGTimeSlider (Designable)
+@interface SRGPlaybackSettingsButton (Designable)
 
 @end
 
 IB_DESIGNABLE
-@interface SRGTimelineView (Designable)
+@interface SRGTimeSlider (Designable)
 
 @end
 
 IB_DESIGNABLE
-@interface SRGTracksButton (Designable)
+@interface SRGTimelineView (Designable)
 
 @end
 

Package.swift

@@ -3,7 +3,7 @@
 import PackageDescription
 
 struct ProjectSettings {
-    static let marketingVersion: String = "6.2.2"
+    static let marketingVersion: String = "7.0.0"
 }
 
 let package = Package(

Sources/SRGMediaPlayer/Resources/Images.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Sources/SRGMediaPlayer/Resources/Images.xcassets/audio_tracks.imageset/Contents.json

@@ -0,0 +1,19 @@
+{
+  "images" : [
+    {
+      "filename" : "audio_tracks.pdf",
+      "idiom" : "iphone"
+    },
+    {
+      "filename" : "audio_tracks-1.pdf",
+      "idiom" : "ipad"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Sources/SRGMediaPlayer/Resources/Images.xcassets/more.imageset/Contents.json

@@ -0,0 +1,19 @@
+{
+  "images" : [
+    {
+      "filename" : "more.pdf",
+      "idiom" : "iphone"
+    },
+    {
+      "filename" : "more-1.pdf",
+      "idiom" : "ipad"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Sources/SRGMediaPlayer/Resources/Images.xcassets/playback_speed.imageset/Contents.json

@@ -0,0 +1,19 @@
+{
+  "images" : [
+    {
+      "filename" : "playback_speed.pdf",
+      "idiom" : "iphone"
+    },
+    {
+      "filename" : "playback_speed-1.pdf",
+      "idiom" : "ipad"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Sources/SRGMediaPlayer/Resources/Images.xcassets/subtitles.imageset/Contents.json

@@ -0,0 +1,19 @@
+{
+  "images" : [
+    {
+      "filename" : "subtitles.pdf",
+      "idiom" : "iphone"
+    },
+    {
+      "filename" : "subtitles-1.pdf",
+      "idiom" : "ipad"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Sources/SRGMediaPlayer/Resources/de.lproj/Accessibility.strings

@@ -25,6 +25,9 @@
 /* Play label of the Play/Pause button */
 "Play" = "Abspielen";
 
+/* Accessibility title of playback settings button */
+"Playback settings" = "Wiedergabeeinstellungen";
+
 /* Picture In Picture button label, when PiP is available */
 "Start Picture in Picture" = "Bild-in-Bild-Funktion starten";
 

Sources/SRGMediaPlayer/Resources/de.lproj/Localizable.strings

@@ -4,18 +4,16 @@
 /* Recommended option (Auto) to let subtitles be automatically selected based on user settings */
 "%@ (Recommended)" = "%@ (empfohlen)";
 
+/* Speed factor. Must be short */
+"%@×" = "%@×";
+
 /* AirPlay device description on which device the media is played if no name provided by the system. Use with \"This media is playing on %@\" */
 "an external device" = "einem externen Gerät";
 
-/* Section header title in the alternate tracks popup menu, for audio tracks */
+/* Section header title in the settings menu, for audio tracks */
 "Audio" = "Ton";
 
-/* Accessibility title of the button to display the pop over view to select audio or subtitles
-   Title of the pop over view to select audio or subtitles */
-"Audio and Subtitles" = "Ton und Untertitel";
-
-/* Automatic option title to let subtitles be automatically selected based on user settings
-   Automatic option title to let subtitles be automatically selected based on user settings */
+/* Automatic option title to let subtitles be automatically selected based on user settings */
 "Auto" = "Automatisch";
 
 /* Information displayed for unavailable subtitle languages */
@@ -33,12 +31,23 @@
 /* AirPlay description on which device the media is played. */
 "Playback on «%@»" = "Wiedergabe auf «%@»";
 
-/* Section header title in the alternate tracks popup menu, for subtitles & CC tracks */
+/* Accessibility title of playback settings button
+   Title of the playback settings popover */
+"Playback settings" = "Wiedergabeeinstellungen";
+
+/* Playback speed menu title
+   Section header title in the settings menu, for setting the playback speed */
+"Playback speed" = "Wiedergabegeschwindigkeit";
+
+/* Section header title in the settings menu, for subtitles & CC tracks */
 "Subtitles & CC" = "Untertitel";
 
 /* Error message when the media cannot be played due to a technical error. */
 "The media cannot be played" = "Inhalt kann nicht abgespielt werden";
 
+/* Information footer about playback speed restrictions */
+"The playback speed is restricted to %@×." = "Die Wiedergabegeschwindigkeit ist auf %@× eingeschränkt.";
+
 /* Fallback for unknown languages */
 "Unknown language" = "Unbekannte Sprache";
 

Sources/SRGMediaPlayer/Resources/en.lproj/Accessibility.strings

@@ -25,6 +25,9 @@
 /* Play label of the Play/Pause button */
 "Play" = "Play";
 
+/* Accessibility title of playback settings button */
+"Playback settings" = "Playback settings";
+
 /* Picture In Picture button label, when PiP is available */
 "Start Picture in Picture" = "Start Picture in Picture";