VLCPlaybackController: Rename to VLCPlaybackService

Apple-TV/Playback/Playback Info/VLCPlaybackInfoChaptersTVViewController.m

@@ -57,10 +57,10 @@
 
     self.titlesDataSource.dependendCollectionView = self.chaptersCollectionView;
 
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mediaPlayerChanged) name:VLCPlaybackControllerPlaybackMetadataDidChange object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mediaPlayerChanged) name:VLCPlaybackServicePlaybackMetadataDidChange object:nil];
 }
 
-+ (BOOL)shouldBeVisibleForPlaybackController:(VLCPlaybackController *)vpc
++ (BOOL)shouldBeVisibleForPlaybackController:(VLCPlaybackService *)vpc
 {
     return [vpc numberOfChaptersForCurrentTitle] > 1;
 }
@@ -92,14 +92,14 @@
 @implementation VLCPlaybackInfoTitlesDataSource
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
-    return [[VLCPlaybackController sharedInstance] numberOfTitles];
+    return [[VLCPlaybackService sharedInstance] numberOfTitles];
 }
 
 - (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
 {
     VLCPlaybackInfoTVCollectionViewCell *trackCell = (VLCPlaybackInfoTVCollectionViewCell*)cell;
     NSInteger row = indexPath.row;
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
 
     BOOL isSelected = [vpc indexOfCurrentTitle] == row;
     trackCell.selectionMarkerVisible = isSelected;
@@ -114,7 +114,7 @@
 
 -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    [[VLCPlaybackController sharedInstance] selectTitleAtIndex:indexPath.row];
+    [[VLCPlaybackService sharedInstance] selectTitleAtIndex:indexPath.row];
     [collectionView reloadData];
     [self.dependendCollectionView reloadData];
 }
@@ -123,7 +123,7 @@
 @implementation VLCPlaybackInfoChaptersDataSource
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
-    return [[VLCPlaybackController sharedInstance] numberOfChaptersForCurrentTitle];
+    return [[VLCPlaybackService sharedInstance] numberOfChaptersForCurrentTitle];
 }
 
 - (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
@@ -131,10 +131,10 @@
     VLCPlaybackInfoTVCollectionViewCell *trackCell = (VLCPlaybackInfoTVCollectionViewCell*)cell;
     NSInteger row = indexPath.row;
 
-    BOOL isSelected = [[VLCPlaybackController sharedInstance] indexOfCurrentChapter] == row;
+    BOOL isSelected = [[VLCPlaybackService sharedInstance] indexOfCurrentChapter] == row;
     trackCell.selectionMarkerVisible = isSelected;
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSDictionary *description = [vpc chapterDescriptionsDictAtIndex:row];
 
     NSString *chapter = description[VLCChapterDescriptionName];
@@ -146,7 +146,7 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    [[VLCPlaybackController sharedInstance] selectChapterAtIndex:indexPath.row];
+    [[VLCPlaybackService sharedInstance] selectChapterAtIndex:indexPath.row];
     [collectionView reloadData];
 }
 

Apple-TV/Playback/Playback Info/VLCPlaybackInfoMediaInfoTVViewController.m

@@ -35,7 +35,7 @@
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(updateMediaTitle)
-                                                 name:VLCPlaybackControllerPlaybackMetadataDidChange
+                                                 name:VLCPlaybackServicePlaybackMetadataDidChange
                                                object:nil];
 }
 
@@ -51,7 +51,7 @@
         self.metaDataLabel.textColor = darkColor;
     }
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     self.titleLabel.text = vpc.metadata.title;
 
     VLCMedia *media = [vpc currentlyPlayingMedia];
@@ -149,7 +149,7 @@
 
 - (void)updateMediaTitle
 {
-    self.titleLabel.text = [VLCPlaybackController sharedInstance].metadata.title;
+    self.titleLabel.text = [VLCPlaybackService sharedInstance].metadata.title;
 }
 
 @end

Apple-TV/Playback/Playback Info/VLCPlaybackInfoPanelTVViewController.h

@@ -11,10 +11,10 @@
 
 #import <UIKit/UIKit.h>
 
-@class VLCPlaybackController;
+@class VLCPlaybackService;
 @protocol VLCPlaybackInfoPanelTVViewController <NSObject>
 
-+ (BOOL)shouldBeVisibleForPlaybackController:(VLCPlaybackController *)vpc;
++ (BOOL)shouldBeVisibleForPlaybackController:(VLCPlaybackService *)vpc;
 
 @end
 

Apple-TV/Playback/Playback Info/VLCPlaybackInfoPanelTVViewController.m

@@ -48,7 +48,7 @@ static inline void sharedSetup(VLCPlaybackInfoPanelTVViewController *self)
     return NO;
 }
 
-+ (BOOL)shouldBeVisibleForPlaybackController:(VLCPlaybackController *)vpc
++ (BOOL)shouldBeVisibleForPlaybackController:(VLCPlaybackService *)vpc
 {
     return YES;
 }

Apple-TV/Playback/Playback Info/VLCPlaybackInfoPlaybackTVViewController.m

@@ -31,7 +31,7 @@
     return CGSizeMake(CGRectGetWidth(self.view.bounds), 200);
 }
 
-+ (BOOL)shouldBeVisibleForPlaybackController:(VLCPlaybackController *)vpc
++ (BOOL)shouldBeVisibleForPlaybackController:(VLCPlaybackService *)vpc
 {
     return [vpc isSeekable];
 }
@@ -86,7 +86,7 @@
 
 - (void)updateRateControl
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     float currentRate = vpc.playbackRate;
 
     NSInteger currentIndex = [self.possibleRates indexOfObjectPassingTest:^BOOL(NSNumber * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -100,13 +100,13 @@
 - (IBAction)rateControlChanged:(UISegmentedControl *)sender
 {
     float newRate = self.possibleRates[sender.selectedSegmentIndex].floatValue;
-    [VLCPlaybackController sharedInstance].playbackRate = newRate;
+    [VLCPlaybackService sharedInstance].playbackRate = newRate;
 }
 
 - (void)updateRepeatControl
 {
     NSUInteger selectedIndex;
-    VLCRepeatMode repeatMode = [VLCPlaybackController sharedInstance].repeatMode;
+    VLCRepeatMode repeatMode = [VLCPlaybackService sharedInstance].repeatMode;
     switch (repeatMode) {
         case VLCRepeatCurrentItem:
             selectedIndex = 1;
@@ -139,7 +139,7 @@
             break;
     }
 
-    [VLCPlaybackController sharedInstance].repeatMode = repeatMode;
+    [VLCPlaybackService sharedInstance].repeatMode = repeatMode;
 }
 
 @end

Apple-TV/Playback/Playback Info/VLCPlaybackInfoSubtitlesFetcherViewController.m

@@ -106,7 +106,7 @@
 - (void)searchForMedia
 {
     [self startActivity];
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     self.osoFetcher.subtitleLanguageId = [defaults stringForKey:kVLCSettingLastUsedSubtitlesSearchLanguage];
     [self.osoFetcher searchForSubtitlesWithQuery:vpc.metadata.title];
@@ -129,10 +129,10 @@
 - (void)MDFOSOFetcher:(MDFOSOFetcher *)aFetcher subtitleDownloadSucceededForItem:(MDFSubtitleItem *)subtitleItem atPath:(NSString *)pathToFile
 {
     [self stopActivity];
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     [vpc openVideoSubTitlesFromFile:pathToFile];
     [self dismissViewControllerAnimated:YES completion:nil];
-    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackMetadataDidChange object:nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackMetadataDidChange object:nil];
 }
 
 #pragma mark - table view datasource

Apple-TV/Playback/Playback Info/VLCPlaybackInfoTVViewController.m

@@ -32,7 +32,7 @@
 
 - (NSArray<UIViewController*>*)tabViewControllers
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     return [_allTabViewControllers filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id<VLCPlaybackInfoPanelTVViewController>  _Nonnull evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
         return [[evaluatedObject class] shouldBeVisibleForPlaybackController:vpc];
     }]];

Apple-TV/Playback/Playback Info/VLCPlaybackInfoTracksTVViewController.m

@@ -57,7 +57,7 @@
     self.subtitleDataSource.title = [NSLocalizedString(@"SUBTITLES", nil) uppercaseStringWithLocale:currentLocale];
     self.subtitleDataSource.cellIdentifier = [VLCPlaybackInfoTVCollectionViewCell identifier];
     self.subtitleDataSource.parentViewController = self;
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mediaPlayerChanged) name:VLCPlaybackControllerPlaybackMetadataDidChange object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mediaPlayerChanged) name:VLCPlaybackServicePlaybackMetadataDidChange object:nil];
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -92,13 +92,13 @@
 @implementation VLCPlaybackInfoTracksDataSourceAudio
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
-    return [[VLCPlaybackController sharedInstance] numberOfAudioTracks] + 1;
+    return [[VLCPlaybackService sharedInstance] numberOfAudioTracks] + 1;
 }
 
 - (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
 {
     VLCPlaybackInfoTVCollectionViewCell *trackCell = (VLCPlaybackInfoTVCollectionViewCell*)cell;
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger row = indexPath.row;
     NSString *trackName;
 
@@ -128,7 +128,7 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger row = indexPath.row;
     if (row >= [vpc numberOfAudioTracks]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -147,13 +147,13 @@
 @implementation VLCPlaybackInfoTracksDataSourceSubtitle
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
-    return [[VLCPlaybackController sharedInstance] numberOfVideoSubtitlesIndexes] + 1;
+    return [[VLCPlaybackService sharedInstance] numberOfVideoSubtitlesIndexes] + 1;
 }
 
 - (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
 {
     VLCPlaybackInfoTVCollectionViewCell *trackCell = (VLCPlaybackInfoTVCollectionViewCell*)cell;
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger row = indexPath.row;
     NSString *trackName;
     if (row >= [vpc numberOfVideoSubtitlesIndexes]) {
@@ -173,7 +173,7 @@
 
 -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger row = indexPath.row;
     if (row >= [vpc numberOfVideoSubtitlesIndexes]) {
         if (self.parentViewController) {

Apple-TV/Playback/VLCFullscreenMovieTVViewController.h

@@ -11,12 +11,12 @@
 
 #import <UIKit/UIKit.h>
 
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCTransportBar.h"
 
 @class VLCNetworkImageView;
 
-@interface VLCFullscreenMovieTVViewController : UIViewController <VLCPlaybackControllerDelegate>
+@interface VLCFullscreenMovieTVViewController : UIViewController <VLCPlaybackServiceDelegate>
 
 @property (readwrite, nonatomic, weak) IBOutlet UIView *movieView;
 

Apple-TV/Playback/VLCFullscreenMovieTVViewController.m

@@ -59,11 +59,11 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
     NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(playbackDidStop)
-                   name:VLCPlaybackControllerPlaybackDidStop
+                   name:VLCPlaybackServicePlaybackDidStop
                  object:nil];
     [center addObserver:self
                selector:@selector(playbackDidStop)
-                   name:VLCPlaybackControllerPlaybackDidFail
+                   name:VLCPlaybackServicePlaybackDidFail
                  object:nil];
 
     _movieView.userInteractionEnabled = NO;
@@ -148,7 +148,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
     self.audioArtworkImageView.animateImageSetting = YES;
     self.audioLargeBackgroundImageView.animateImageSetting = YES;
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     vpc.delegate = self;
     [vpc recoverPlaybackState];
 }
@@ -157,7 +157,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
 {
     [super viewDidAppear:animated];
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     [vpc recoverDisplayedMetadata];
     vpc.videoOutputView = nil;
     vpc.videoOutputView = self.movieView;
@@ -165,7 +165,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
 
 - (void)viewWillDisappear:(BOOL)animated
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     if (vpc.videoOutputView == self.movieView) {
         vpc.videoOutputView = nil;
     }
@@ -196,7 +196,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
 
     [self setScanState:VLCPlayerScanStateNone];
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     if (self.transportBar.scrubbing) {
         [self selectButtonPressed];
     } else {
@@ -206,7 +206,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
 
 - (void)panGesture:(UIPanGestureRecognizer *)panGestureRecognizer
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger currentTitle = [vpc indexOfCurrentTitle];
     if (currentTitle < [vpc numberOfTitles]) {
         NSDictionary *title = [vpc titleDescriptionsDictAtIndex:currentTitle];
@@ -276,7 +276,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
 
 - (void)selectButtonPressed
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger currentTitle = [vpc indexOfCurrentTitle];
     if (currentTitle < [vpc numberOfTitles]) {
         NSDictionary *title = [vpc titleDescriptionsDictAtIndex:currentTitle];
@@ -314,7 +314,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
 
 - (void)showInfoVCIfNotScrubbing
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger currentTitle = [vpc indexOfCurrentTitle];
     if (currentTitle < [vpc numberOfTitles]) {
         NSDictionary *title = [vpc titleDescriptionsDictAtIndex:currentTitle];
@@ -341,7 +341,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
 
 - (void)handleIRPressUp
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger currentTitle = [vpc indexOfCurrentTitle];
     if (currentTitle < [vpc numberOfTitles]) {
         NSDictionary *title = [vpc titleDescriptionsDictAtIndex:currentTitle];
@@ -353,7 +353,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
 
 - (void)handleIRPressLeft
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger currentTitle = [vpc indexOfCurrentTitle];
     if (currentTitle < [vpc numberOfTitles]) {
         NSDictionary *title = [vpc titleDescriptionsDictAtIndex:currentTitle];
@@ -369,7 +369,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
         return;
     }
 
-    BOOL paused = ![VLCPlaybackController sharedInstance].isPlaying;
+    BOOL paused = ![VLCPlaybackService sharedInstance].isPlaying;
     if (paused) {
         [self jumpBackward];
     } else
@@ -380,7 +380,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
 
 - (void)handleIRPressRight
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger currentTitle = [vpc indexOfCurrentTitle];
     if (currentTitle < [vpc numberOfTitles]) {
         NSDictionary *title = [vpc titleDescriptionsDictAtIndex:currentTitle];
@@ -396,7 +396,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
         return;
     }
 
-    BOOL paused = ![VLCPlaybackController sharedInstance].isPlaying;
+    BOOL paused = ![VLCPlaybackService sharedInstance].isPlaying;
     if (paused) {
         [self jumpForward];
     } else {
@@ -406,7 +406,7 @@ typedef NS_ENUM(NSInteger, VLCPlayerScanState)
 
 - (void)handleSiriRemote:(VLCSiriRemoteGestureRecognizer *)recognizer
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger currentTitle = [vpc indexOfCurrentTitle];
     if (currentTitle < [vpc numberOfTitles]) {
         NSDictionary *title = [vpc titleDescriptionsDictAtIndex:currentTitle];
@@ -520,7 +520,7 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
 {
     NSAssert(self.isSeekable, @"Tried to seek while not media is not seekable.");
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
 
     if (vpc.isPlaying) {
         [self jumpInterval:VLCJumpInterval];
@@ -532,7 +532,7 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
 {
     NSAssert(self.isSeekable, @"Tried to seek while not media is not seekable.");
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
 
     if (vpc.isPlaying) {
         [self jumpInterval:-VLCJumpInterval];
@@ -545,11 +545,11 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
 {
     NSAssert(self.isSeekable, @"Tried to seek while not media is not seekable.");
 
-    NSInteger duration = [VLCPlaybackController sharedInstance].mediaDuration;
+    NSInteger duration = [VLCPlaybackService sharedInstance].mediaDuration;
     if (duration==0) {
         return;
     }
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
 
     CGFloat intervalFraction = ((CGFloat)interval)/((CGFloat)duration);
     CGFloat currentFraction = vpc.playbackPosition;
@@ -561,7 +561,7 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
 {
     NSAssert(self.isSeekable, @"Tried to seek while not media is not seekable.");
 
-    NSInteger duration = [VLCPlaybackController sharedInstance].mediaDuration;
+    NSInteger duration = [VLCPlaybackService sharedInstance].mediaDuration;
     if (duration==0) {
         return;
     }
@@ -624,7 +624,7 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
     NSAssert(self.isSeekable || scanState == VLCPlayerScanStateNone, @"Tried to seek while media not seekable.");
 
     if (_scanState == VLCPlayerScanStateNone) {
-        self.scanSavedPlaybackRate = @([VLCPlaybackController sharedInstance].playbackRate);
+        self.scanSavedPlaybackRate = @([VLCPlaybackService sharedInstance].playbackRate);
     }
     _scanState = scanState;
     float rate = 1.0;
@@ -647,24 +647,24 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
             break;
     }
 
-    [VLCPlaybackController sharedInstance].playbackRate = rate;
+    [VLCPlaybackService sharedInstance].playbackRate = rate;
     [self.transportBar setHint:hint];
 }
 
 - (BOOL)isSeekable
 {
-    return [[VLCPlaybackController sharedInstance] isSeekable];
+    return [[VLCPlaybackService sharedInstance] isSeekable];
 }
 
 - (BOOL)canJump
 {
     // to match the AVPlayerViewController behavior only allow jumping when playing.
-    return [VLCPlaybackController sharedInstance].isPlaying;
+    return [VLCPlaybackService sharedInstance].isPlaying;
 }
 - (BOOL)canScrub
 {
     // to match the AVPlayerViewController behavior only allow scrubbing when paused.
-    return ![VLCPlaybackController sharedInstance].isPlaying;
+    return ![VLCPlaybackService sharedInstance].isPlaying;
 }
 
 #pragma mark -
@@ -672,7 +672,7 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
 - (void)updateTimeLabelsForScrubbingFraction:(CGFloat)scrubbingFraction
 {
     VLCTransportBar *bar = self.transportBar;
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     // MAX 1, _ is ugly hack to prevent --:-- instead of 00:00
     int scrubbingTimeInt = MAX(1,vpc.mediaDuration*scrubbingFraction);
     VLCTime *scrubbingTime = [VLCTime timeWithInt:scrubbingTimeInt];
@@ -685,7 +685,7 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
 {
     NSAssert(self.isSeekable, @"Tried to seek while not media is not seekable.");
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     self.transportBar.scrubbing = YES;
     [self updateDimmingView];
     if (vpc.isPlaying) {
@@ -696,7 +696,7 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
 {
     self.transportBar.scrubbing = NO;
     [self updateDimmingView];
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     [vpc playPause];
 }
 
@@ -733,14 +733,14 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
 
 - (void)fireHidePlaybackControlsIfNotPlayingTimer:(NSTimer *)timer
 {
-    BOOL playing = [[VLCPlaybackController sharedInstance] isPlaying];
+    BOOL playing = [[VLCPlaybackService sharedInstance] isPlaying];
     if (playing) {
         [self animatePlaybackControlsToVisibility:NO];
     }
 }
 - (void)showPlaybackControlsIfNeededForUserInteraction
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSInteger currentTitle = [vpc indexOfCurrentTitle];
     if (currentTitle < [vpc numberOfTitles]) {
         NSDictionary *title = [vpc titleDescriptionsDictAtIndex:currentTitle];
@@ -798,7 +798,7 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
 
 #pragma mark - playback controller delegation
 
-- (void)prepareForMediaPlayback:(VLCPlaybackController *)controller
+- (void)prepareForMediaPlayback:(VLCPlaybackService *)controller
 {
     self.audioView.hidden = YES;
 }
@@ -812,16 +812,16 @@ static const NSInteger VLCJumpInterval = 10000; // 10 seconds
                       isPlaying:(BOOL)isPlaying
 currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
         currentMediaHasChapters:(BOOL)currentMediaHasChapters
-          forPlaybackController:(VLCPlaybackController *)controller
+          forPlaybackService:(VLCPlaybackService *)playbackService
 {
 
     [self updateActivityIndicatorForState:currentState];
 
-    if (controller.isPlaying) {
+    if (playbackService.isPlaying) {
         // we sometimes don't set the vout correctly if playback stops and restarts without dismising and redisplaying the VC
         // hence, manually reset the vout container here if it doesn't have sufficient children
         if (self.movieView.subviews.count < 2) {
-            controller.videoOutputView = self.movieView;
+            playbackService.videoOutputView = self.movieView;
         }
 
         if (!self.bufferingLabel.hidden) {
@@ -832,7 +832,8 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
     }
 }
 
-- (void)displayMetadataForPlaybackController:(VLCPlaybackController *)controller metadata:(VLCMetaData *)metadata
+- (void)displayMetadataForPlaybackService:(VLCPlaybackService *)playbackService
+                                 metadata:(VLCMetaData *)metadata
 {
     NSString *title = metadata.title;
     NSString *artist = metadata.artist;
@@ -896,14 +897,14 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 
 - (void)updateTransportBarPosition
 {
-    VLCPlaybackController *controller = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *controller = [VLCPlaybackService sharedInstance];
     VLCTransportBar *transportBar = self.transportBar;
     transportBar.remainingTimeLabel.text = [[controller remainingTime] stringValue];
     transportBar.markerTimeLabel.text = [[controller playedTime] stringValue];
     transportBar.playbackFraction = controller.playbackPosition;
 }
 
-- (void)playbackPositionUpdated:(VLCPlaybackController *)controller
+- (void)playbackPositionUpdated:(VLCPlaybackService *)controller
 {
     // FIXME: hard coded state since the state in mediaPlayer is incorrectly still buffering
     [self updateActivityIndicatorForState:VLCMediaPlayerStatePlaying];

Apple-TV/VLCOpenNetworkStreamTVViewController.m

@@ -10,7 +10,7 @@
  *****************************************************************************/
 
 #import "VLCOpenNetworkStreamTVViewController.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCPlayerDisplayController.h"
 #import "VLCFullscreenMovieTVViewController.h"
 #import "CAAnimation+VLCWiggle.h"
@@ -145,7 +145,7 @@
 
 - (void)_openURLStringAndDismiss:(NSString *)urlString
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     VLCMedia *media = [VLCMedia mediaWithURL:[NSURL URLWithString:urlString]];
     VLCMediaList *medialist = [[VLCMediaList alloc] init];
     [medialist addMedia:media];

Apple-TV/VLCRemoteBrowsingCollectionViewController.m

@@ -12,7 +12,7 @@
 #import "VLCRemoteBrowsingCollectionViewController.h"
 #import "VLCRemoteBrowsingTVCell.h"
 #import "VLCPlayerDisplayController.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCServerBrowsingController.h"
 #import "VLCMaskView.h"
 

Apple-TV/VLCRemotePlaybackViewController.m

@@ -300,7 +300,7 @@
     VLCMediaList *medialist = [[VLCMediaList alloc] init];
     [medialist addMedia:[VLCMedia mediaWithURL:url]];
 
-    [[VLCPlaybackController sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
+    [[VLCPlaybackService sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
     [self presentViewController:[VLCFullscreenMovieTVViewController fullscreenMovieTVViewController]
                        animated:YES
                      completion:nil];

Apple-TV/VLCServerBrowsingTVViewController.m

@@ -12,7 +12,7 @@
 #import "VLCServerBrowsingTVViewController.h"
 #import "VLCRemoteBrowsingTVCell.h"
 #import "VLCPlayerDisplayController.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCServerBrowsingController.h"
 #import "VLCMaskView.h"
 #import "GRKArrayDiff+UICollectionView.h"

Apple-TV/VLCServerListTVViewController.m

@@ -191,7 +191,7 @@
         VLCMediaList *medialist = [[VLCMediaList alloc] init];
         [medialist addMedia:[VLCMedia mediaWithURL:url]];
 
-        [[VLCPlaybackController sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
+        [[VLCPlaybackService sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
 
         [self presentViewController:[VLCFullscreenMovieTVViewController fullscreenMovieTVViewController]
                            animated:YES

SharedSources/Clouds/VLCBoxCollectionViewController.m

@@ -14,7 +14,7 @@
 #import "VLCBoxCollectionViewController.h"
 #import "VLCBoxController.h"
 #import <XKKeychain/XKKeychainGenericPasswordItem.h>
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCRemoteBrowsingTVCell+CloudStorage.h"
 
 @interface VLCBoxCollectionViewController () <VLCCloudStorageDelegate, NSURLConnectionDataDelegate>
@@ -161,7 +161,7 @@
         /* now ask VLC to stream the URL we were just passed */
         VLCMediaList *medialist = [[VLCMediaList alloc] init];
         [medialist addMedia:[VLCMedia mediaWithURL:theActualURL]];
-        [[VLCPlaybackController sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
+        [[VLCPlaybackService sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
 
         VLCFullscreenMovieTVViewController *movieVC = [VLCFullscreenMovieTVViewController fullscreenMovieTVViewController];
         [self presentViewController:movieVC

SharedSources/Clouds/VLCOneDriveCollectionViewController.m

@@ -99,7 +99,7 @@
 
         VLCMediaList *medialist = [[VLCMediaList alloc] init];
         [medialist addMedia:[VLCMedia mediaWithURL:url]];
-        [[VLCPlaybackController sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
+        [[VLCPlaybackService sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
 
         VLCFullscreenMovieTVViewController *movieVC = [VLCFullscreenMovieTVViewController fullscreenMovieTVViewController];
         [self presentViewController:movieVC

SharedSources/MediaLibraryService.swift

@@ -351,7 +351,7 @@ extension MediaLibraryService {
         return medialib.media(withIdentifier: identifier)
     }
 
-    func savePlaybackState(from player: VLCPlaybackController) {
+    func savePlaybackState(from player: PlaybackService) {
 
         let media: VLCMedia? = player.currentlyPlayingMedia
         guard let mlMedia = fetchMedia(with: media?.url.absoluteURL) else {

SharedSources/ServerBrowsing/VLCServerBrowsingController.m

@@ -15,7 +15,7 @@
 #import "NSString+SupportedMedia.h"
 #import "UIDevice+VLC.h"
 
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 
 #if TARGET_OS_TV
 #import "VLCFullscreenMovieTVViewController.h"
@@ -203,7 +203,7 @@
 
 - (void)streamMediaList:(VLCMediaList *)mediaList startingAtIndex:(NSInteger)startIndex
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     vpc.fullscreenSessionRequested = YES;
     [vpc playMediaList:mediaList firstIndex:startIndex subtitlesFilePath:nil];
     [self showMovieViewController];
@@ -224,7 +224,7 @@
     if(remoteSubtitleURL)
         URLofSubtitle = [self _getFileSubtitleFromServer:remoteSubtitleURL];
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     vpc.fullscreenSessionRequested = YES;
     VLCMediaList *medialist = [[VLCMediaList alloc] init];
     [medialist addMedia:[VLCMedia mediaWithURL:item.URL]];

SharedSources/VLCMetadata.m

@@ -11,7 +11,7 @@
 
 #import "VLCMetadata.h"
 #import <MediaPlayer/MediaPlayer.h>
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 
 #if TARGET_OS_IOS
 #import "VLC-Swift.h"
@@ -85,7 +85,7 @@
     self.playbackDuration = @(mediaPlayer.media.length.intValue / 1000.);
     self.playbackRate = @(mediaPlayer.rate);
     self.elapsedPlaybackTime = @(mediaPlayer.time.value.floatValue / 1000.);
-    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackMetadataDidChange object:self];
+    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackMetadataDidChange object:self];
 }
 
 - (void)checkIsAudioOnly:(VLCMediaPlayer *)mediaPlayer

SharedSources/VLCPlaybackController+VLCDialogProvider.swift

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCPlaybackController+VLCDialogProvider.swift
+ * VLCPlaybackService+VLCDialogProvider.swift
  * VLC for iOS
  *****************************************************************************
  * Copyright (c) 2018 VideoLAN. All rights reserved.
@@ -12,7 +12,7 @@
 
 import Foundation
 
-extension VLCPlaybackController: VLCCustomDialogRendererProtocol {
+extension PlaybackService: VLCCustomDialogRendererProtocol {
     public func showError(withTitle error: String, message: String) {
         //noop
     }

SharedSources/VLCPlayerControlWebSocket.m

@@ -20,31 +20,31 @@
     NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
     [notificationCenter addObserver:self
                            selector:@selector(playbackStarted)
-                               name:VLCPlaybackControllerPlaybackDidStart
+                               name:VLCPlaybackServicePlaybackDidStart
                              object:nil];
     [notificationCenter addObserver:self
                            selector:@selector(playbackStarted)
-                               name:VLCPlaybackControllerPlaybackDidResume
+                               name:VLCPlaybackServicePlaybackDidResume
                              object:nil];
     [notificationCenter addObserver:self
                            selector:@selector(_respondToPlaying)
-                               name:VLCPlaybackControllerPlaybackMetadataDidChange
+                               name:VLCPlaybackServicePlaybackMetadataDidChange
                              object:nil];
     [notificationCenter addObserver:self
                            selector:@selector(playbackPaused)
-                               name:VLCPlaybackControllerPlaybackDidPause
+                               name:VLCPlaybackServicePlaybackDidPause
                              object:nil];
     [notificationCenter addObserver:self
                            selector:@selector(playbackEnded)
-                               name:VLCPlaybackControllerPlaybackDidStop
+                               name:VLCPlaybackServicePlaybackDidStop
                              object:nil];
     [notificationCenter addObserver:self
                            selector:@selector(playbackEnded)
-                               name:VLCPlaybackControllerPlaybackDidFail
+                               name:VLCPlaybackServicePlaybackDidFail
                              object:nil];
     [notificationCenter addObserver:self
                            selector:@selector(playbackSeekTo)
-                               name:VLCPlaybackControllerPlaybackPositionUpdated
+                               name:VLCPlaybackServicePlaybackPositionUpdated
                              object:nil];
 
     APLog(@"web socket did open");
@@ -108,7 +108,7 @@
      }
      */
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSDictionary *returnDict;
 
     if (vpc.isPlaying) {
@@ -138,7 +138,7 @@
 
 - (void)_respondToPlay
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     [vpc play];
 }
 
@@ -150,7 +150,7 @@
         "currentTime": 42
      }
      */
-     VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+     VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSDictionary *dict = @{ @"currentTime" : @([vpc playedTime].intValue),
                                   @"type" : @"play" };
     [self sendDataWithDict:dict];
@@ -161,7 +161,7 @@
 
 - (void)_respondToPause
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     [vpc pause];
 }
 
@@ -173,7 +173,7 @@
         "currentTime": 42,
      }
      */
-     VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+     VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     NSDictionary *dict = @{ @"currentTime" : @([vpc playedTime].intValue),
                             @"type" : @"pause" };
     [self sendDataWithDict:dict];
@@ -181,7 +181,7 @@
 
 - (void)sendDataWithDict:(NSDictionary *)dict
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
 
     VLCMedia *media = [vpc currentlyPlayingMedia];
     if (media) {
@@ -199,7 +199,7 @@
 
 - (void)_respondToEnded
 {
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     [vpc stopPlayback];
 }
 
@@ -224,7 +224,7 @@
         "type" = seekTo;
      }
      */
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
 
     VLCMedia *media = [vpc currentlyPlayingMedia];
     if (!media)
@@ -245,7 +245,7 @@
      }
      */
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     VLCMedia *media = [vpc currentlyPlayingMedia];
     NSDictionary *mediaDict = @{ @"id" : media.url.absoluteString};
     NSDictionary *dict = @{ @"currentTime" : @([vpc playedTime].intValue),
@@ -265,7 +265,7 @@
      */
     BOOL needsMediaList = NO;
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     VLCMediaList *mediaList = vpc.mediaList;
     if (!mediaList) {
         needsMediaList = YES;

Sources/LocalNetworkConnectivity/VLCNetworkServerBrowserViewController.m

@@ -16,7 +16,7 @@
 #import "VLCNetworkListCell.h"
 #import "VLCActivityManager.h"
 #import "VLCStatusLabel.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCDownloadViewController.h"
 
 #import "VLCNetworkServerBrowser-Protocol.h"

Sources/LocalNetworkConnectivity/VLCServerListViewController.m

@@ -18,7 +18,7 @@
 #import "VLCServerListViewController.h"
 #import "VLCLocalServerDiscoveryController.h"
 
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCNetworkListCell.h"
 #import "VLCNetworkLoginViewController.h"
 #import "VLCNetworkServerBrowserViewController.h"
@@ -294,7 +294,7 @@
 
             VLCMediaList *medialist = [[VLCMediaList alloc] init];
             [medialist addMedia:[VLCMedia mediaWithURL:playbackURL]];
-            [[VLCPlaybackController sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
+            [[VLCPlaybackService sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
             return;
         }
     }

Sources/MediaCategories/MediaCategoryViewController.swift

@@ -531,7 +531,7 @@ private extension MediaCategoryViewController {
 extension MediaCategoryViewController {
 
     func play(media: VLCMLMedia, at indexPath: IndexPath) {
-        let playbackController = VLCPlaybackController.sharedInstance()
+        let playbackController = PlaybackService.sharedInstance()
         let autoPlayNextItem = UserDefaults.standard.bool(forKey: kVLCAutomaticallyPlayNextItem)
 
         playbackController.fullscreenSessionRequested = media.type() != .audio

Sources/MiniPlayer/AudioMiniPlayer.swift

@@ -27,7 +27,7 @@ class AudioMiniPlayer: UIView, MiniPlayer {
     @IBOutlet private weak var nextButton: UIButton!
 
     private var mediaService: MediaLibraryService
-    private lazy var playbackController = VLCPlaybackController.sharedInstance()
+    private lazy var playbackController = PlaybackService.sharedInstance()
 
     @objc init(service: MediaLibraryService) {
         self.mediaService = service
@@ -87,35 +87,35 @@ private extension AudioMiniPlayer {
     }
 }
 
-// MARK: - VLCPlaybackControllerDelegate
+// MARK: - VLCPlaybackServiceDelegate
 
 extension AudioMiniPlayer {
-    func prepare(forMediaPlayback controller: VLCPlaybackController) {
+    func prepare(forMediaPlayback playbackService: PlaybackService) {
         updatePlayPauseButton()
-        controller.delegate = self
-        controller.recoverDisplayedMetadata()
+        playbackService.delegate = self
+        playbackService.recoverDisplayedMetadata()
         // For now, AudioMiniPlayer will be used for all media
-        controller.videoOutputView = artworkImageView
+        playbackService.videoOutputView = artworkImageView
     }
 
     func mediaPlayerStateChanged(_ currentState: VLCMediaPlayerState,
                                  isPlaying: Bool,
                                  currentMediaHasTrackToChooseFrom: Bool,
                                  currentMediaHasChapters: Bool,
-                                 for controller: VLCPlaybackController) {
+                                 for playbackService: PlaybackService) {
         updatePlayPauseButton()
     }
 
-    func displayMetadata(for controller: VLCPlaybackController, metadata: VLCMetaData) {
+    func displayMetadata(for playbackService: PlaybackService, metadata: VLCMetaData) {
         setMediaInfo(metadata)
     }
 
-    func playbackPositionUpdated(_ controller: VLCPlaybackController) {
-        progressBarView.progress = controller.playbackPosition
+    func playbackPositionUpdated(_ playbackService: PlaybackService) {
+        progressBarView.progress = playbackService.playbackPosition
     }
 
-    func savePlaybackState(_ controller: VLCPlaybackController) {
-        mediaService.savePlaybackState(from: controller)
+    func savePlaybackState(_ playbackService: PlaybackService) {
+        mediaService.savePlaybackState(from: playbackService)
     }
 
     func media(forPlaying media: VLCMedia) -> VLCMLMedia? {

Sources/MiniPlayer/MiniPlayer.swift

@@ -11,7 +11,7 @@
  *****************************************************************************/
 
 @objc(VLCMiniPlayer)
-protocol MiniPlayer: VLCMiniPlaybackViewInterface, VLCPlaybackControllerDelegate {
+protocol MiniPlayer: VLCMiniPlaybackViewInterface, VLCPlaybackServiceDelegate {
     var contentHeight: Float { get }
     func updatePlayPauseButton()
 }

Sources/PlaybackSpeedView.swift

@@ -30,7 +30,7 @@ class PlaybackSpeedView: VLCFrostedGlasView {
     @objc weak var delegate: PlaybackSpeedViewDelegate?
     private var sleepCountDownTimer: Timer?
 
-    let vpc = VLCPlaybackController.sharedInstance()
+    let vpc = PlaybackService.sharedInstance()
 
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -62,7 +62,7 @@ class PlaybackSpeedView: VLCFrostedGlasView {
             options: nil).first as? PlaybackSpeedView
     }
 
-    @objc func prepareForMediaPlayback(controller: VLCPlaybackController) {
+    @objc func prepareForMediaPlayback(controller: PlaybackService) {
         let playbackRate = controller.playbackRate
         playbackSpeedSlider.value = log2(playbackRate)
         playbackSpeedIndicator.text = String(format: "%.2fx", playbackRate)

Sources/URLHandler.swift

@@ -207,7 +207,7 @@ class ElseCallbackURLHandler: NSObject, VLCURLHandler {
 extension VLCURLHandler {
     // TODO: This code should probably not live here
     func play(url: URL, sub: URL? = nil, completion: ((Bool) -> Void)?) {
-        let vpc = VLCPlaybackController.sharedInstance()
+        let vpc = PlaybackService.sharedInstance()
         vpc.fullscreenSessionRequested = true
         if let mediaList = VLCMediaList(array: [VLCMedia(url: url)]) {
             vpc.playMediaList(mediaList, firstIndex: 0, subtitlesFilePath: sub?.absoluteString, completion: completion)

Sources/VLCAppDelegate.m

@@ -22,8 +22,8 @@
 #import "NSString+SupportedMedia.h"
 #import "UIDevice+VLC.h"
 #import "VLCHTTPUploaderController.h"
-#import "VLCPlaybackController.h"
-#import "VLCPlaybackController+MediaLibrary.h"
+#import "VLCPlaybackService.h"
+#import "VLCPlaybackService+MediaLibrary.h"
 #import <MediaPlayer/MediaPlayer.h>
 #import <HockeySDK/HockeySDK.h>
 #import "VLCActivityManager.h"
@@ -160,7 +160,7 @@ continueUserActivity:(NSUserActivity *)userActivity
     if (!media) return NO;
 
     [self validatePasscodeIfNeededWithCompletion:^{
-        [[VLCPlaybackController sharedInstance] playMedia:media];
+        [[VLCPlaybackService sharedInstance] playMedia:media];
     }];
     return YES;
 }
@@ -202,7 +202,7 @@ didFailToContinueUserActivityWithType:(NSString *)userActivityType
     }
     [self validatePasscodeIfNeededWithCompletion:^{
         //TODO: handle updating the videoview and
-        if ([VLCPlaybackController sharedInstance].isPlaying){
+        if ([VLCPlaybackService sharedInstance].isPlaying){
             //TODO: push playback
         }
     }];
@@ -214,7 +214,7 @@ didFailToContinueUserActivityWithType:(NSString *)userActivityType
     if (!_isComingFromHandoff) {
         [[MLMediaLibrary sharedMediaLibrary] updateMediaDatabase];
       //  [[VLCMediaFileDiscoverer sharedInstance] updateMediaList];
-        [[VLCPlaybackController sharedInstance] recoverDisplayedMetadata];
+        [[VLCPlaybackService sharedInstance] recoverDisplayedMetadata];
     } else if(_isComingFromHandoff) {
         _isComingFromHandoff = NO;
     }

Sources/VLCBoxController.m

@@ -12,7 +12,7 @@
 
 #import "VLCBoxController.h"
 #import "NSString+SupportedMedia.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCMediaFileDiscoverer.h"
 #import <XKKeychain/XKKeychainGenericPasswordItem.h>
 #if TARGET_OS_IOS

Sources/VLCBoxTableViewController.m

@@ -15,7 +15,7 @@
 #import "VLCBoxController.h"
 #import <XKKeychain/XKKeychainGenericPasswordItem.h>
 #import "UIDevice+VLC.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLC-Swift.h"
 
 #if TARGET_OS_IOS
@@ -223,7 +223,7 @@
         VLCMedia *media = [VLCMedia mediaWithURL:theActualURL];
         VLCMediaList *medialist = [[VLCMediaList alloc] init];
         [medialist addMedia:media];
-        [[VLCPlaybackController sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
+        [[VLCPlaybackService sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
     }
 
     return request;

Sources/VLCDropboxController.m

@@ -13,7 +13,7 @@
 
 #import "VLCDropboxController.h"
 #import "NSString+SupportedMedia.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCActivityManager.h"
 #import "VLCMediaFileDiscoverer.h"
 #import "VLCDropboxConstants.h"
@@ -276,7 +276,7 @@
             VLCMedia *media = [VLCMedia mediaWithURL:[NSURL URLWithString:result.link]];
             VLCMediaList *medialist = [[VLCMediaList alloc] init];
             [medialist addMedia:media];
-            [[VLCPlaybackController sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
+            [[VLCPlaybackService sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:nil];
 #if TARGET_OS_TV
             if (self.lastKnownNavigationController) {
                 VLCFullscreenMovieTVViewController *movieVC = [VLCFullscreenMovieTVViewController fullscreenMovieTVViewController];

Sources/VLCGoogleDriveController.m

@@ -14,7 +14,7 @@
 
 #import "VLCGoogleDriveController.h"
 #import "NSString+SupportedMedia.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCMediaFileDiscoverer.h"
 #import "VLC-Swift.h"
 #import <XKKeychain/XKKeychain.h>
@@ -225,7 +225,7 @@
     NSString *urlString = [NSString stringWithFormat:@"https://www.googleapis.com/drive/v3/files/%@?alt=media&access_token=%@",
                      file.identifier, token];
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     VLCMedia *media = [VLCMedia mediaWithURL:[NSURL URLWithString:urlString]];
     VLCMediaList *medialist = [[VLCMediaList alloc] init];
     [medialist addMedia:media];

Sources/VLCHTTPConnection.m

@@ -389,7 +389,7 @@
      }
      */
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     if (!vpc.isPlaying) {
         return [[HTTPErrorResponse alloc] initWithErrorCode:404];
     }
@@ -459,7 +459,7 @@
      ...]
      */
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     if (!vpc.isPlaying || !vpc.mediaList) {
         return [[HTTPErrorResponse alloc] initWithErrorCode:404];
     }
@@ -579,7 +579,7 @@
 
     [_receivedFiles addObject:path];
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     VLCMediaList *mediaList = vpc.mediaList;
 
     if (!mediaList) {

Sources/VLCMovieViewControlPanelView.m

@@ -12,7 +12,7 @@
  *****************************************************************************/
 
 #import "VLCMovieViewControlPanelView.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCMetadata.h"
 #import "VLC-Swift.h"
 
@@ -23,7 +23,7 @@
 @property (nonatomic, strong) UIView *spacer2;
 @property (nonatomic, strong) NSMutableArray *constraints;
 @property (nonatomic, assign) BOOL compactMode;
-@property (nonatomic, strong) VLCPlaybackController *playbackController;
+@property (nonatomic, strong) VLCPlaybackService *playbackController;
 @end
 
 @implementation VLCMovieViewControlPanelView
@@ -221,10 +221,10 @@ static const CGFloat maxControlsWidth = 474.0;
     [self updateViewConstraints];
 }
 
-- (VLCPlaybackController *)playbackController
+- (VLCPlaybackService *)playbackController
 {
     if (!_playbackController) {
-        _playbackController = [VLCPlaybackController sharedInstance];
+        _playbackController = [VLCPlaybackService sharedInstance];
     }
     return _playbackController;
 }

Sources/VLCMovieViewController.h

@@ -13,7 +13,7 @@
 
 #import <MediaPlayer/MediaPlayer.h>
 #import "VLCFrostedGlasView.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 
 @class OBSlider;
 @class VLCServices;
@@ -33,7 +33,7 @@ typedef NS_ENUM(NSInteger, VLCMovieJumpState) {
 - (BOOL)movieViewControllerShouldBeDisplayed:(VLCMovieViewController *)movieViewController;
 @end
 
-@interface VLCMovieViewController : UIViewController <UIActionSheetDelegate, VLCPlaybackControllerDelegate>
+@interface VLCMovieViewController : UIViewController <UIActionSheetDelegate, VLCPlaybackServiceDelegate>
 
 @property (nonatomic, strong) IBOutlet UIView *movieView;
 @property (nonatomic, strong) IBOutlet VLCStatusLabel *statusLabel;

Sources/VLCMovieViewController.m

@@ -24,7 +24,7 @@
 #import "VLCMovieViewController.h"
 #import "VLCEqualizerView.h"
 #import "VLCMultiSelectionMenuView.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCTimeNavigationTitleView.h"
 #import "VLCAppDelegate.h"
 #import "VLCStatusLabel.h"
@@ -55,7 +55,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
   VLCPanTypeProjection
 };
 
-@interface VLCMovieViewController () <UIGestureRecognizerDelegate, VLCMultiSelectionViewDelegate, VLCEqualizerViewUIDelegate, VLCPlaybackControllerDelegate, VLCDeviceMotionDelegate, VLCRendererDiscovererManagerDelegate, PlaybackSpeedViewDelegate, VLCVideoOptionsControlBarDelegate, VLCMediaMoreOptionsActionSheetDelegate, VLCMediaNavigationBarDelegate>
+@interface VLCMovieViewController () <UIGestureRecognizerDelegate, VLCMultiSelectionViewDelegate, VLCEqualizerViewUIDelegate, VLCPlaybackServiceDelegate, VLCDeviceMotionDelegate, VLCRendererDiscovererManagerDelegate, PlaybackSpeedViewDelegate, VLCVideoOptionsControlBarDelegate, VLCMediaMoreOptionsActionSheetDelegate, VLCMediaNavigationBarDelegate>
 {
     BOOL _controlsHidden;
     BOOL _videoFiltersHidden;
@@ -104,7 +104,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
     VLCMediaMoreOptionsActionSheet *_moreOptionsActionSheet;
     VLCMediaNavigationBar *_mediaNavigationBar;
 
-    VLCPlaybackController *_vpc;
+    VLCPlaybackService *_vpc;
 
     UIView *_sleepTimerContainer;
     UIDatePicker *_sleepTimeDatePicker;
@@ -150,7 +150,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
 {
     [super viewDidLoad];
 
-    _vpc = [VLCPlaybackController sharedInstance];
+    _vpc = [VLCPlaybackService sharedInstance];
 
     self.extendedLayoutIncludesOpaqueBars = YES;
     self.edgesForExtendedLayout = UIRectEdgeAll;
@@ -197,7 +197,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
                  object:nil];
     [center addObserver:self
                selector:@selector(playbackDidStop:)
-                   name:VLCPlaybackControllerPlaybackDidStop
+                   name:VLCPlaybackServicePlaybackDidStop
                  object:nil];
 
     self.artistNameLabel.text = self.albumNameLabel.text = @"";
@@ -233,7 +233,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
     [self.view addSubview:_trackSelectorContainer];
 
     _equalizerView = [[VLCEqualizerView alloc] initWithFrame:CGRectMake(0, 0, 450., 240.)];
-    _equalizerView.delegate = [VLCPlaybackController sharedInstance];
+    _equalizerView.delegate = [VLCPlaybackService sharedInstance];
     _equalizerView.UIdelegate = self;
     _equalizerView.autoresizingMask = UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin;
     _equalizerView.hidden = YES;
@@ -1175,19 +1175,19 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
 
 #pragma mark - playback controller delegation
 
-- (void)playbackPositionUpdated:(VLCPlaybackController *)controller
+- (void)playbackPositionUpdated:(VLCPlaybackService *)playbackService
 {
     // FIXME: hard coded state since the state in mediaPlayer is incorrectly still buffering
     [self updateActivityIndicatorForState:VLCMediaPlayerStatePlaying];
 
     if (!_isScrubbing) {
-        self.timeNavigationTitleView.positionSlider.value = [controller playbackPosition];
+        self.timeNavigationTitleView.positionSlider.value = [playbackService playbackPosition];
     }
 
     [self updateTimeDisplayButton];
 }
 
-- (void)prepareForMediaPlayback:(VLCPlaybackController *)controller
+- (void)prepareForMediaPlayback:(VLCPlaybackService *)playbackService
 {
     #if !NEW_UI
         self.trackNameLabel.text = @"";
@@ -1200,7 +1200,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
     self.timeNavigationTitleView.timeDisplayButton.accessibilityLabel = @"";
     [_equalizerView reloadData];
 
-    [_playbackSpeedView prepareForMediaPlaybackWithController:controller];
+    [_playbackSpeedView prepareForMediaPlaybackWithController:playbackService];
 
     [self _resetIdleTimer];
 }
@@ -1216,12 +1216,12 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
                       isPlaying:(BOOL)isPlaying
 currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
         currentMediaHasChapters:(BOOL)currentMediaHasChapters
-          forPlaybackController:(VLCPlaybackController *)controller
+             forPlaybackService:(VLCPlaybackService *)playbackService
 {
     [self updateActivityIndicatorForState:currentState];
 
     if (currentState == VLCMediaPlayerStateBuffering)
-        _mediaDuration = controller.mediaDuration;
+        _mediaDuration = playbackService.mediaDuration;
 
     if (currentState == VLCMediaPlayerStateError)
         [self.statusLabel showStatusMessage:NSLocalizedString(@"PLAYBACK_FAILED", nil)];
@@ -1233,9 +1233,9 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
     #endif
 }
 
-- (void)savePlaybackState:(VLCPlaybackController *)controller
+- (void)savePlaybackState:(VLCPlaybackService *)playbackService
 {
-    [_services.medialibraryService savePlaybackStateFrom:controller];
+    [_services.medialibraryService savePlaybackStateFrom:playbackService];
 }
 
 - (VLCMLMedia *)mediaForPlayingMedia:(VLCMedia *)media
@@ -1257,12 +1257,13 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
                      }];
 }
 
-- (void)playbackControllerDidSwitchAspectRatio:(VLCAspectRatio)aspectRatio
+- (void) playbackServiceDidSwitchAspectRatio:(VLCAspectRatio)aspectRatio
 {
     _videoOptionsControlBar.isInFullScreen = aspectRatio == VLCAspectRatioFillToScreen;
 }
 
-- (void)displayMetadataForPlaybackController:(VLCPlaybackController *)controller metadata:(VLCMetaData *)metadata
+- (void)displayMetadataForPlaybackService:(VLCPlaybackService *)playbackService
+                                 metadata:(VLCMetaData *)metadata
 {
     if (!_viewAppeared)
         return;
@@ -1519,11 +1520,11 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 
 - (void)toggleRepeatMode
 {
-    [[VLCPlaybackController sharedInstance] toggleRepeatMode];
+    [[VLCPlaybackService sharedInstance] toggleRepeatMode];
     #if !NEW_UI
-        _multiSelectionView.repeatMode = [VLCPlaybackController sharedInstance].repeatMode;
+        _multiSelectionView.repeatMode = [VLCPlaybackService sharedInstance].repeatMode;
     #else
-        _videoOptionsControlBar.repeatMode = [VLCPlaybackController sharedInstance].repeatMode;
+        _videoOptionsControlBar.repeatMode = [VLCPlaybackService sharedInstance].repeatMode;
     #endif
 }
 
@@ -1806,7 +1807,7 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 - (IBAction)videoDimensionAction:(id)sender
 {
     if (sender == self.timeNavigationTitleView.aspectRatioButton) {
-        [[VLCPlaybackController sharedInstance] switchAspectRatio:NO];
+        [[VLCPlaybackService sharedInstance] switchAspectRatio:NO];
     }
 }
 

Sources/VLCOneDriveTableViewController.m

@@ -14,7 +14,7 @@
 #import "VLCOneDriveTableViewController.h"
 #import "VLCOneDriveController.h"
 #import "VLCCloudStorageTableViewCell.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCProgressView.h"
 #import "UIDevice+VLC.h"
 #import "NSString+SupportedMedia.h"
@@ -170,7 +170,7 @@
         return;
     }
 
-    VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *vpc = [VLCPlaybackService sharedInstance];
     vpc.fullscreenSessionRequested = NO;
     [vpc playMediaList:mediaList firstIndex:startIndex subtitlesFilePath:subtitlesFilePath];
 }

Sources/VLCOpenNetworkStreamViewController.m

@@ -13,7 +13,7 @@
  *****************************************************************************/
 
 #import "VLCOpenNetworkStreamViewController.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCStreamingHistoryCell.h"
 #import "UIDevice+VLC.h"
 #import "VLC-Swift.h"
@@ -377,7 +377,7 @@ forRowAtIndexPath:(NSIndexPath *)indexPath
     VLCMedia *media = [VLCMedia mediaWithURL:[NSURL URLWithString:url]];
     VLCMediaList *medialist = [[VLCMediaList alloc] init];
     [medialist addMedia:media];
-    [[VLCPlaybackController sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:subtitlesURL.absoluteString];
+    [[VLCPlaybackService sharedInstance] playMediaList:medialist firstIndex:0 subtitlesFilePath:subtitlesURL.absoluteString];
 }
 
 - (NSURL *)_checkURLofSubtitle:(NSURL *)url

Sources/VLCPlaybackController+MediaLibrary.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCPlaybackController+MediaLibrary.h
+ * VLCPlaybackService+MediaLibrary.h
  * VLC for iOS
  *****************************************************************************
  * Copyright (c) 2015-2019 VideoLAN. All rights reserved.
@@ -10,10 +10,10 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 
 @class VLCMLMedia;
-@interface VLCPlaybackController (MediaLibrary)
+@interface VLCPlaybackService (MediaLibrary)
 
 - (void)playMedia:(VLCMLMedia *)media;
 - (void)playMediaAtIndex:(NSInteger)index fromCollection:(NSArray<VLCMLMedia *> *)collection;

Sources/VLCPlaybackController+MediaLibrary.m

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCPlaybackController+MediaLibrary.m
+ * VLCPlaybackService+MediaLibrary.m
  * VLC for iOS
  *****************************************************************************
  * Copyright (c) 2015-2019 VideoLAN. All rights reserved.
@@ -11,11 +11,11 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import "VLCPlaybackController+MediaLibrary.h"
+#import "VLCPlaybackService+MediaLibrary.h"
 #import <VLCMediaLibraryKit/VLCMLFile.h>
 #import <VLCMediaLibraryKit/VLCMLMedia.h>
 
-@implementation VLCPlaybackController (MediaLibrary)
+@implementation VLCPlaybackService (MediaLibrary)
 
 - (void)playMediaAtIndex:(NSInteger)index fromCollection:(NSArray<VLCMLMedia *> *)collection
 {

Sources/VLCPlaybackController.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCPlaybackController.h
+ * VLCPlaybackService.h
  * VLC for iOS
  *****************************************************************************
  * Copyright (c) 2013-2015 VideoLAN. All rights reserved.
@@ -22,39 +22,41 @@ typedef NS_ENUM(NSUInteger, VLCAspectRatio) {
 };
 
 NS_ASSUME_NONNULL_BEGIN
-extern NSString * const VLCPlaybackControllerPlaybackDidStart;
-extern NSString *const VLCPlaybackControllerPlaybackDidPause;
-extern NSString *const VLCPlaybackControllerPlaybackDidResume;
-extern NSString *const VLCPlaybackControllerPlaybackDidStop;
-extern NSString *const VLCPlaybackControllerPlaybackDidFail;
-extern NSString *const VLCPlaybackControllerPlaybackMetadataDidChange;
-extern NSString *const VLCPlaybackControllerPlaybackPositionUpdated;
-
-@class VLCPlaybackController;
+extern NSString *const VLCPlaybackServicePlaybackDidStart;
+extern NSString *const VLCPlaybackServicePlaybackDidPause;
+extern NSString *const VLCPlaybackServicePlaybackDidResume;
+extern NSString *const VLCPlaybackServicePlaybackDidStop;
+extern NSString *const VLCPlaybackServicePlaybackDidFail;
+extern NSString *const VLCPlaybackServicePlaybackMetadataDidChange;
+extern NSString *const VLCPlaybackServicePlaybackPositionUpdated;
+
+@class VLCPlaybackService;
 @class VLCMetaData;
 @class VLCDialogProvider;
 @class VLCMLMedia;
 
-@protocol VLCPlaybackControllerDelegate <NSObject>
+@protocol VLCPlaybackServiceDelegate <NSObject>
 #if TARGET_OS_IOS
-- (void)savePlaybackState:(VLCPlaybackController *)controller;
+- (void)savePlaybackState:(VLCPlaybackService *)playbackService;
 - (VLCMLMedia *_Nullable)mediaForPlayingMedia:(VLCMedia *)media;
 #endif
 @optional
-- (void)playbackPositionUpdated:(VLCPlaybackController *)controller;
+- (void)playbackPositionUpdated:(VLCPlaybackService *)playbackService;
 - (void)mediaPlayerStateChanged:(VLCMediaPlayerState)currentState
                       isPlaying:(BOOL)isPlaying
 currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
         currentMediaHasChapters:(BOOL)currentMediaHasChapters
-          forPlaybackController:(VLCPlaybackController *)controller;
-- (void)prepareForMediaPlayback:(VLCPlaybackController *)controller;
+             forPlaybackService:(VLCPlaybackService *)playbackService;
+- (void)prepareForMediaPlayback:(VLCPlaybackService *)playbackService;
 - (void)showStatusMessage:(NSString *)statusMessage;
-- (void)displayMetadataForPlaybackController:(VLCPlaybackController *)controller metadata:(VLCMetaData *)metadata;
-- (void)playbackControllerDidSwitchAspectRatio:(VLCAspectRatio)aspectRatio;
+- (void)displayMetadataForPlaybackService:(VLCPlaybackService *)playbackService
+                                 metadata:(VLCMetaData *)metadata;
+- (void)playbackServiceDidSwitchAspectRatio:(VLCAspectRatio)aspectRatio;
 
 @end
 
-@interface VLCPlaybackController : NSObject <VLCEqualizerViewDelegate>
+NS_SWIFT_NAME(PlaybackService)
+@interface VLCPlaybackService : NSObject <VLCEqualizerViewDelegate>
 
 @property (nonatomic, strong, nullable) UIView *videoOutputView;
 
@@ -64,7 +66,7 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 
 @property (nonatomic, strong, readonly) VLCMedia *currentlyPlayingMedia;
 
-@property (nonatomic, weak) id<VLCPlaybackControllerDelegate> delegate;
+@property (nonatomic, weak) id<VLCPlaybackServiceDelegate> delegate;
 
 @property (nonatomic, readonly) VLCMediaPlayerState mediaPlayerState;
 @property (nonatomic, readonly) VLCMetaData *metadata;
@@ -110,7 +112,7 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 
 @property (nonatomic, nullable) VLCRendererItem *renderer;
 
-+ (VLCPlaybackController *)sharedInstance;
++ (VLCPlaybackService *)sharedInstance;
 - (VLCTime *)playedTime;
 #pragma mark - playback
 - (void)startPlayback;

Sources/VLCPlaybackController.m

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCPlaybackController.m
+ * VLCPlaybackService.m
  * VLC for iOS
  *****************************************************************************
  * Copyright (c) 2013-2018 VideoLAN. All rights reserved.
@@ -16,7 +16,7 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "UIDevice+VLC.h"
 #import <AVFoundation/AVFoundation.h>
 #import "VLCRemoteControlService.h"
@@ -25,15 +25,15 @@
 #import "VLC-Swift.h"
 #endif
 
-NSString *const VLCPlaybackControllerPlaybackDidStart = @"VLCPlaybackControllerPlaybackDidStart";
-NSString *const VLCPlaybackControllerPlaybackDidPause = @"VLCPlaybackControllerPlaybackDidPause";
-NSString *const VLCPlaybackControllerPlaybackDidResume = @"VLCPlaybackControllerPlaybackDidResume";
-NSString *const VLCPlaybackControllerPlaybackDidStop = @"VLCPlaybackControllerPlaybackDidStop";
-NSString *const VLCPlaybackControllerPlaybackMetadataDidChange = @"VLCPlaybackControllerPlaybackMetadataDidChange";
-NSString *const VLCPlaybackControllerPlaybackDidFail = @"VLCPlaybackControllerPlaybackDidFail";
-NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackControllerPlaybackPositionUpdated";
+NSString *const VLCPlaybackServicePlaybackDidStart = @"VLCPlaybackServicePlaybackDidStart";
+NSString *const VLCPlaybackServicePlaybackDidPause = @"VLCPlaybackServicePlaybackDidPause";
+NSString *const VLCPlaybackServicePlaybackDidResume = @"VLCPlaybackServicePlaybackDidResume";
+NSString *const VLCPlaybackServicePlaybackDidStop = @"VLCPlaybackServicePlaybackDidStop";
+NSString *const VLCPlaybackServicePlaybackMetadataDidChange = @"VLCPlaybackServicePlaybackMetadataDidChange";
+NSString *const VLCPlaybackServicePlaybackDidFail = @"VLCPlaybackServicePlaybackDidFail";
+NSString *const VLCPlaybackServicePlaybackPositionUpdated = @"VLCPlaybackServicePlaybackPositionUpdated";
 
-@interface VLCPlaybackController () <VLCMediaPlayerDelegate, VLCMediaDelegate, VLCRemoteControlServiceDelegate>
+@interface VLCPlaybackService () <VLCMediaPlayerDelegate, VLCMediaDelegate, VLCRemoteControlServiceDelegate>
 {
     VLCRemoteControlService *_remoteControlService;
     VLCMediaPlayer *_mediaPlayer;
@@ -67,17 +67,17 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
 
 @end
 
-@implementation VLCPlaybackController
+@implementation VLCPlaybackService
 
 #pragma mark instance management
 
-+ (VLCPlaybackController *)sharedInstance
++ (VLCPlaybackService *)sharedInstance
 {
-    static VLCPlaybackController *sharedInstance = nil;
+    static VLCPlaybackService *sharedInstance = nil;
     static dispatch_once_t pred;
 
     dispatch_once(&pred, ^{
-        sharedInstance = [VLCPlaybackController new];
+        sharedInstance = [VLCPlaybackService new];
     });
 
     return sharedInstance;
@@ -261,7 +261,7 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
 
     _playerIsSetup = YES;
 
-    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackDidStart object:self];
+    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackDidStart object:self];
     [_playbackSessionManagementLock unlock];
 }
 
@@ -307,7 +307,7 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
     [[self remoteControlService] unsubscribeFromRemoteCommands];
 
     [_playbackSessionManagementLock unlock];
-    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackDidStop object:self];
+    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackDidStop object:self];
     if (_sessionWillRestart) {
         _sessionWillRestart = NO;
         [self startPlayback];
@@ -348,7 +348,7 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
     if ([self.delegate respondsToSelector:@selector(playbackPositionUpdated:)])
         [self.delegate playbackPositionUpdated:self];
 
-    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackPositionUpdated
+    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackPositionUpdated
                                                         object:self];
 }
 
@@ -649,7 +649,7 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
         case VLCMediaPlayerStateError: {
             APLog(@"Playback failed");
             dispatch_async(dispatch_get_main_queue(),^{
-                [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackDidFail object:self];
+                [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackDidFail object:self];
             });
             _sessionWillRestart = NO;
             [self stopPlayback];
@@ -669,12 +669,12 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
             break;
     }
 
-    if ([self.delegate respondsToSelector:@selector(mediaPlayerStateChanged:isPlaying:currentMediaHasTrackToChooseFrom:currentMediaHasChapters:forPlaybackController:)])
+    if ([self.delegate respondsToSelector:@selector(mediaPlayerStateChanged:isPlaying:currentMediaHasTrackToChooseFrom:currentMediaHasChapters:forPlaybackService:)])
         [self.delegate mediaPlayerStateChanged:currentState
                                      isPlaying:_mediaPlayer.isPlaying
               currentMediaHasTrackToChooseFrom:self.currentMediaHasTrackToChooseFrom
                        currentMediaHasChapters:self.currentMediaHasChapters
-                         forPlaybackController:self];
+                         forPlaybackService:self];
 
     [self setNeedsMetadataUpdate];
 }
@@ -688,7 +688,7 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
 - (void)play
 {
     [_listPlayer play];
-    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackDidResume object:self];
+    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackDidResume object:self];
 }
 
 - (void)pause
@@ -697,7 +697,7 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
 #if TARGET_OS_IOS
     [_delegate savePlaybackState: self];
 #endif
-    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackDidPause object:self];
+    [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackDidPause object:self];
 }
 
 - (void)next
@@ -723,7 +723,7 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
         } while (currentIndex == nextIndex.unsignedIntegerValue || [_shuffleStack containsObject:nextIndex]);
 
         [_listPlayer playItemAtNumber:[NSNumber numberWithUnsignedInteger:nextIndex.unsignedIntegerValue]];
-        [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackMetadataDidChange object:self];
+        [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackMetadataDidChange object:self];
 
         return;
     }
@@ -731,7 +731,7 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
 
     if (mediaListCount > 1) {
         [_listPlayer next];
-        [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackMetadataDidChange object:self];
+        [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackMetadataDidChange object:self];
     } else {
         NSNumber *skipLength = [[NSUserDefaults standardUserDefaults] valueForKey:kVLCSettingPlaybackForwardSkipLength];
         [_mediaPlayer jumpForward:skipLength.intValue];
@@ -742,7 +742,7 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
 {
     if (_mediaList.count > 1) {
         [_listPlayer previous];
-        [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackMetadataDidChange object:self];
+        [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackMetadataDidChange object:self];
     }
     else {
         NSNumber *skipLength = [[NSUserDefaults standardUserDefaults] valueForKey:kVLCSettingPlaybackBackwardSkipLength];
@@ -827,8 +827,8 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
         [self.delegate showStatusMessage:[NSString stringWithFormat:NSLocalizedString(@"AR_CHANGED", nil), [self stringForAspectRatio:_currentAspectRatio]]];
     }
 
-    if ([self.delegate respondsToSelector:@selector(playbackControllerDidSwitchAspectRatio:)]) {
-        [_delegate playbackControllerDidSwitchAspectRatio:_currentAspectRatio];
+    if ([self.delegate respondsToSelector:@selector(playbackServiceDidSwitchAspectRatio:)]) {
+        [_delegate playbackServiceDidSwitchAspectRatio:_currentAspectRatio];
     }
 }
 
@@ -1040,7 +1040,7 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
 #if TARGET_OS_IOS
        [_delegate savePlaybackState: self];
 #endif
-        [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackDidPause object:self];
+        [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackServicePlaybackDidPause object:self];
     }
     _externalAudioPlaybackDeviceConnected = externalAudioPlaybackDeviceConnected;
 }
@@ -1125,18 +1125,18 @@ NSString *const VLCPlaybackControllerPlaybackPositionUpdated = @"VLCPlaybackCont
 
 - (void)recoverDisplayedMetadata
 {
-    if ([self.delegate respondsToSelector:@selector(displayMetadataForPlaybackController:metadata:)])
-        [self.delegate displayMetadataForPlaybackController:self metadata:_metadata];
+    if ([self.delegate respondsToSelector:@selector(displayMetadataForPlaybackService:metadata:)])
+        [self.delegate displayMetadataForPlaybackService:self metadata:_metadata];
 }
 
 - (void)recoverPlaybackState
 {
-    if ([self.delegate respondsToSelector:@selector(mediaPlayerStateChanged:isPlaying:currentMediaHasTrackToChooseFrom:currentMediaHasChapters:forPlaybackController:)])
+    if ([self.delegate respondsToSelector:@selector(mediaPlayerStateChanged:isPlaying:currentMediaHasTrackToChooseFrom:currentMediaHasChapters:forPlaybackService:)])
         [self.delegate mediaPlayerStateChanged:_mediaPlayer.state
                                      isPlaying:self.isPlaying
               currentMediaHasTrackToChooseFrom:self.currentMediaHasTrackToChooseFrom
                        currentMediaHasChapters:self.currentMediaHasChapters
-                         forPlaybackController:self];
+                         forPlaybackService:self];
     if ([self.delegate respondsToSelector:@selector(prepareForMediaPlayback:)])
         [self.delegate prepareForMediaPlayback:self];
 }

Sources/VLCPlayerDisplayController.h

@@ -10,7 +10,7 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-@class VLCPlaybackController;
+@class VLCPlaybackService;
 @class VLCServices;
 
 typedef NS_ENUM(NSUInteger, VLCPlayerDisplayControllerDisplayMode) {
@@ -32,7 +32,7 @@ typedef NS_ENUM(NSUInteger, VLCPlayerDisplayControllerDisplayMode) {
 @interface VLCPlayerDisplayController : UIViewController
 
 @property (nonatomic, assign) VLCPlayerDisplayControllerDisplayMode displayMode;
-@property (nonatomic, weak) VLCPlaybackController *playbackController;
+@property (nonatomic, weak) VLCPlaybackService *playbackController;
 @property (nonatomic, strong) NSLayoutYAxisAnchor *realBottomAnchor;
 
 - (instancetype)init NS_UNAVAILABLE;

Sources/VLCPlayerDisplayController.m

@@ -11,9 +11,9 @@
  *****************************************************************************/
 
 #import "VLCPlayerDisplayController.h"
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCPlaybackNavigationController.h"
-#import "VLCPlaybackController+MediaLibrary.h"
+#import "VLCPlaybackService+MediaLibrary.h"
 #import "VLC-Swift.h"
 #if TARGET_OS_IOS
 #import "VLCMovieViewController.h"
@@ -37,8 +37,8 @@ static NSString *const VLCPlayerDisplayControllerDisplayModeKey = @"VLCPlayerDis
 @end
 
 @interface VLCPlayerDisplayController () <VLCMovieViewControllerDelegate>
-@property (nonatomic, strong) UIViewController<VLCPlaybackControllerDelegate> *movieViewController;
-@property (nonatomic, strong) UIView<VLCPlaybackControllerDelegate, VLCMiniPlayer> *miniPlaybackView;
+@property (nonatomic, strong) UIViewController<VLCPlaybackServiceDelegate> *movieViewController;
+@property (nonatomic, strong) UIView<VLCPlaybackServiceDelegate, VLCMiniPlayer> *miniPlaybackView;
 @property (nonatomic, strong) NSLayoutConstraint *bottomConstraint;
 @property (nonatomic, strong) VLCServices *services;
 @end
@@ -54,9 +54,9 @@ static NSString *const VLCPlayerDisplayControllerDisplayModeKey = @"VLCPlayerDis
         _services = services;
 
         NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
-        [notificationCenter addObserver:self selector:@selector(playbackDidStart:) name:VLCPlaybackControllerPlaybackDidStart object:nil];
-        [notificationCenter addObserver:self selector:@selector(playbackDidFail:) name:VLCPlaybackControllerPlaybackDidFail object:nil];
-        [notificationCenter addObserver:self selector:@selector(playbackDidStop:) name:VLCPlaybackControllerPlaybackDidStop object:nil];
+        [notificationCenter addObserver:self selector:@selector(playbackDidStart:) name:VLCPlaybackServicePlaybackDidStart object:nil];
+        [notificationCenter addObserver:self selector:@selector(playbackDidFail:) name:VLCPlaybackServicePlaybackDidFail object:nil];
+        [notificationCenter addObserver:self selector:@selector(playbackDidStop:) name:VLCPlaybackServicePlaybackDidStop object:nil];
         [[NSUserDefaults standardUserDefaults] registerDefaults:@{VLCPlayerDisplayControllerDisplayModeKey : @(VLCPlayerDisplayControllerDisplayModeFullscreen)}];
     }
     return self;
@@ -80,14 +80,14 @@ static NSString *const VLCPlayerDisplayControllerDisplayModeKey = @"VLCPlayerDis
     [[NSUserDefaults standardUserDefaults] setInteger:displayMode forKey:VLCPlayerDisplayControllerDisplayModeKey];
 }
 
-- (VLCPlaybackController *)playbackController {
+- (VLCPlaybackService *)playbackController {
     if (_playbackController == nil) {
-        _playbackController = [VLCPlaybackController sharedInstance];
+        _playbackController = [VLCPlaybackService sharedInstance];
     }
     return _playbackController;
 }
 
-- (UIViewController<VLCPlaybackControllerDelegate> *)movieViewController
+- (UIViewController<VLCPlaybackServiceDelegate> *)movieViewController
 {
     if (!_movieViewController) {
 #if TARGET_OS_IOS
@@ -236,7 +236,7 @@ static NSString *const VLCPlayerDisplayControllerDisplayModeKey = @"VLCPlayerDis
 
 - (void)_presentMovieViewControllerAnimated:(BOOL)animated
 {
-    UIViewController<VLCPlaybackControllerDelegate> *movieViewController = self.movieViewController;
+    UIViewController<VLCPlaybackServiceDelegate> *movieViewController = self.movieViewController;
     UINavigationController *navCon = [[VLCPlaybackNavigationController alloc] initWithRootViewController:movieViewController];
     [movieViewController prepareForMediaPlayback:self.playbackController];
 
@@ -256,8 +256,8 @@ static NSString *const VLCPlayerDisplayControllerDisplayModeKey = @"VLCPlayerDis
         return;
     }
 
-    VLCPlaybackController *playbackController = [VLCPlaybackController sharedInstance];
-    UIView<VLCPlaybackControllerDelegate, VLCMiniPlayer> *miniPlaybackView = self.miniPlaybackView;
+    VLCPlaybackService *playbackController = [VLCPlaybackService sharedInstance];
+    UIView<VLCPlaybackServiceDelegate, VLCMiniPlayer> *miniPlaybackView = self.miniPlaybackView;
     const NSTimeInterval animationDuration = 0.25;
     const BOOL activePlaybackSession = playbackController.isPlaying || playbackController.willPlay || playbackController.playerIsSetup;
     const BOOL miniPlayerVisible = miniPlaybackView.visible;
@@ -291,7 +291,7 @@ static NSString *const VLCPlayerDisplayControllerDisplayModeKey = @"VLCPlayerDis
     } else if (needsHide) {
         miniPlaybackView.visible = NO;
         completionBlock = ^(BOOL finished) {
-            UIView<VLCPlaybackControllerDelegate, VLCMiniPlayer> *miniPlaybackView = self.miniPlaybackView;
+            UIView<VLCPlaybackServiceDelegate, VLCMiniPlayer> *miniPlaybackView = self.miniPlaybackView;
             if (miniPlaybackView.visible == NO) {
                 [miniPlaybackView removeFromSuperview];
                 self.miniPlaybackView = nil;

Sources/VLCRendererDiscovererManager.swift

@@ -99,7 +99,7 @@ class VLCRendererDiscovererManager: NSObject {
     }
 
     fileprivate func setRendererItem(rendererItem: VLCRendererItem) {
-        let vpcRenderer = VLCPlaybackController.sharedInstance().renderer
+        let vpcRenderer = PlaybackService.sharedInstance().renderer
         var finalRendererItem: VLCRendererItem?
         var isSelected: Bool = false
 
@@ -108,7 +108,7 @@ class VLCRendererDiscovererManager: NSObject {
             isSelected = true
         }
 
-        VLCPlaybackController.sharedInstance().renderer = finalRendererItem
+        PlaybackService.sharedInstance().renderer = finalRendererItem
         for button in rendererButtons {
             button.isSelected = isSelected
         }
@@ -118,7 +118,7 @@ class VLCRendererDiscovererManager: NSObject {
         actionSheet.setAction { [weak self] (item) in
             if let rendererItem = item as? VLCRendererItem {
                 //if we select the same renderer we want to disconnect
-                let oldRenderer = VLCPlaybackController.sharedInstance().renderer
+                let oldRenderer = PlaybackService.sharedInstance().renderer
                 self?.setRendererItem(rendererItem: rendererItem)
                 if let handler = selectionHandler {
                     handler(oldRenderer == rendererItem ? nil : rendererItem)
@@ -162,7 +162,7 @@ extension VLCRendererDiscovererManager: VLCRendererDiscovererDelegate {
     }
 
     func rendererDiscovererItemDeleted(_ rendererDiscoverer: VLCRendererDiscoverer, item: VLCRendererItem) {
-        let playbackController = VLCPlaybackController.sharedInstance()
+        let playbackController = PlaybackService.sharedInstance()
         // Current renderer has been removed
         if playbackController.renderer == item {
             playbackController.renderer = nil
@@ -226,7 +226,7 @@ extension VLCRendererDiscovererManager: ActionSheetDelegate {
             assertionFailure("VLCRendererDiscovererManager: VLCActionSheetDelegate: Cell is not a VLCActionSheetCell")
             return
         }
-        let isCurrentlySelectedRenderer = renderer == VLCPlaybackController.sharedInstance().renderer
+        let isCurrentlySelectedRenderer = renderer == PlaybackService.sharedInstance().renderer
 
         if !isCurrentlySelectedRenderer {
             collectionView.reloadData()
@@ -254,7 +254,7 @@ extension VLCRendererDiscovererManager: ActionSheetDataSource {
         let renderers = getAllRenderers()
         if indexPath.row < renderers.count {
             cell.name.text = renderers[indexPath.row].name
-            let isSelectedRenderer = renderers[indexPath.row] == VLCPlaybackController.sharedInstance().renderer ? true : false
+            let isSelectedRenderer = renderers[indexPath.row] == PlaybackService.sharedInstance().renderer ? true : false
             updateCollectionViewCellApparence(cell: cell, highlighted: isSelectedRenderer)
         } else {
             assertionFailure("VLCRendererDiscovererManager: VLCActionSheetDataSource: IndexPath out of range")

Sources/VLCTrackSelectorView.m

@@ -12,7 +12,7 @@
 
 #import "VLCTrackSelectorView.h"
 
-#import "VLCPlaybackController.h"
+#import "VLCPlaybackService.h"
 #import "VLCTrackSelectorHeaderView.h"
 #import "VLCTrackSelectorTableViewCell.h"
 
@@ -84,7 +84,7 @@
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
     NSInteger sections = 0;
-    VLCPlaybackController *playbackController = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *playbackController = [VLCPlaybackService sharedInstance];
 
     if (_switchingTracksNotChapters) {
         if([playbackController numberOfAudioTracks] > 2)
@@ -122,7 +122,7 @@
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
 {
-    VLCPlaybackController *playbackController = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *playbackController = [VLCPlaybackService sharedInstance];
 
     if (_switchingTracksNotChapters) {
         if ([playbackController numberOfAudioTracks] > 2 && section == 0)
@@ -147,7 +147,7 @@
 
     NSInteger row = indexPath.row;
     NSInteger section = indexPath.section;
-    VLCPlaybackController *playbackController = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *playbackController = [VLCPlaybackService sharedInstance];
 
     if (_switchingTracksNotChapters) {
         NSString *trackName;
@@ -196,7 +196,7 @@
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    VLCPlaybackController *playbackController = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *playbackController = [VLCPlaybackService sharedInstance];
 
     if (_switchingTracksNotChapters) {
         if ([playbackController numberOfAudioTracks] > 2 && section == 0)
@@ -215,7 +215,7 @@
 {
     [tableView deselectRowAtIndexPath:indexPath animated:NO];
     NSInteger index = indexPath.row;
-    VLCPlaybackController *playbackController = [VLCPlaybackController sharedInstance];
+    VLCPlaybackService *playbackController = [VLCPlaybackService sharedInstance];
 
     if (_switchingTracksNotChapters) {
         if ([playbackController numberOfAudioTracks] > 2 && indexPath.section == 0) {

VLC.xcodeproj/project.pbxproj

@@ -171,7 +171,7 @@
 		7D6B08FC174D773C00A05173 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 7D6B08FB174D773C00A05173 /* Settings.bundle */; };
 		7D7EF3DA1BD56B5900CD4CEE /* VLCOpenNetworkStreamTVViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D7EF3D81BD56B5900CD4CEE /* VLCOpenNetworkStreamTVViewController.m */; };
 		7D7EF3DB1BD56B5900CD4CEE /* VLCOpenNetworkStreamTVViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D7EF3D91BD56B5900CD4CEE /* VLCOpenNetworkStreamTVViewController.xib */; };
-		7D7EF3DD1BD5779F00CD4CEE /* VLCPlaybackController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE56C191AD93F9100E8CA00 /* VLCPlaybackController.m */; };
+		7D7EF3DD1BD5779F00CD4CEE /* VLCPlaybackService.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE56C191AD93F9100E8CA00 /* VLCPlaybackService.m */; };
 		7D7F9C0D1BFBB05400508518 /* VLCRemoteBrowsingTVCell+CloudStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D7F9C0C1BFBB05400508518 /* VLCRemoteBrowsingTVCell+CloudStorage.m */; };
 		7D84E4C61B41AB2800EA7D1F /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D84E4C51B41AB2800EA7D1F /* VideoToolbox.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		7D84E4C91B41ABCE00EA7D1F /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D84E4C81B41ABCE00EA7D1F /* CoreMedia.framework */; };
@@ -215,7 +215,7 @@
 		7DDE41901BE9225A0065C53A /* VLCAboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DDE418E1BE9225A0065C53A /* VLCAboutViewController.xib */; };
 		7DDE41931BE925820065C53A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7D13294E1BA1F10100BE647E /* Assets.xcassets */; };
 		7DDFF4251BDFD23300913BD1 /* VLCCone512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DDFF4241BDFD23300913BD1 /* VLCCone512x512.png */; };
-		7DE56C1A1AD93F9100E8CA00 /* VLCPlaybackController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE56C191AD93F9100E8CA00 /* VLCPlaybackController.m */; };
+		7DE56C1A1AD93F9100E8CA00 /* VLCPlaybackService.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE56C191AD93F9100E8CA00 /* VLCPlaybackService.m */; };
 		7DEBF3791C075EBC007A4043 /* VLCPlaybackInfoSubtitlesFetcherViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DEBF3771C075EBC007A4043 /* VLCPlaybackInfoSubtitlesFetcherViewController.m */; };
 		7DEBF37A1C075EBC007A4043 /* VLCPlaybackInfoSubtitlesFetcherViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DEBF3781C075EBC007A4043 /* VLCPlaybackInfoSubtitlesFetcherViewController.xib */; };
 		7DEBF37F1C076EE8007A4043 /* NSString+Locale.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DEBF37E1C076EE8007A4043 /* NSString+Locale.m */; };
@@ -362,7 +362,7 @@
 		DD846BDF1D1FCCCD00699D17 /* VLCNetworkLoginDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD846BDE1D1FCCCD00699D17 /* VLCNetworkLoginDataSource.m */; };
 		DD870E951CEF78D800BBD4FE /* VLCNetworkLoginDataSourceLogin.m in Sources */ = {isa = PBXBuildFile; fileRef = DD870E941CEF78D800BBD4FE /* VLCNetworkLoginDataSourceLogin.m */; };
 		DD870E9A1CEF929A00BBD4FE /* VLCNetworkLoginViewFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DD870E991CEF929A00BBD4FE /* VLCNetworkLoginViewFieldCell.m */; };
-		DD8F84311B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.m in Sources */ = {isa = PBXBuildFile; fileRef = DD8F84301B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.m */; };
+		DD8F84311B00EB3B0009138A /* VLCPlaybackService+MediaLibrary.m in Sources */ = {isa = PBXBuildFile; fileRef = DD8F84301B00EB3B0009138A /* VLCPlaybackService+MediaLibrary.m */; };
 		DD9D8F5F1C00C73F00B4060F /* VLCDeleteHintTVView.m in Sources */ = {isa = PBXBuildFile; fileRef = DD9D8F5E1C00C73F00B4060F /* VLCDeleteHintTVView.m */; };
 		DD9D8F651C01F96700B4060F /* VLCPlaybackInfoChaptersTVViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DD9D8F631C01F96700B4060F /* VLCPlaybackInfoChaptersTVViewController.m */; };
 		DD9D8F681C01FAB500B4060F /* VLCPlaybackInfoChaptersTVViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DD9D8F671C01FAB500B4060F /* VLCPlaybackInfoChaptersTVViewController.xib */; };
@@ -778,8 +778,8 @@
 		7DDE418D1BE9225A0065C53A /* VLCAboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCAboutViewController.m; sourceTree = "<group>"; };
 		7DDE418E1BE9225A0065C53A /* VLCAboutViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VLCAboutViewController.xib; sourceTree = "<group>"; };
 		7DDFF4241BDFD23300913BD1 /* VLCCone512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = VLCCone512x512.png; path = Resources/VLCCone512x512.png; sourceTree = SOURCE_ROOT; };
-		7DE56C181AD93F9100E8CA00 /* VLCPlaybackController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaybackController.h; path = Sources/VLCPlaybackController.h; sourceTree = SOURCE_ROOT; };
-		7DE56C191AD93F9100E8CA00 /* VLCPlaybackController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaybackController.m; path = Sources/VLCPlaybackController.m; sourceTree = SOURCE_ROOT; };
+		7DE56C181AD93F9100E8CA00 /* VLCPlaybackService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaybackService.h; path = Sources/VLCPlaybackService.h; sourceTree = SOURCE_ROOT; };
+		7DE56C191AD93F9100E8CA00 /* VLCPlaybackService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaybackService.m; path = Sources/VLCPlaybackService.m; sourceTree = SOURCE_ROOT; };
 		7DEB3B5F17647DE30038FC70 /* iTunesArtwork@2x */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTunesArtwork@2x"; sourceTree = "<group>"; };
 		7DEBF3761C075EBC007A4043 /* VLCPlaybackInfoSubtitlesFetcherViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCPlaybackInfoSubtitlesFetcherViewController.h; sourceTree = "<group>"; };
 		7DEBF3771C075EBC007A4043 /* VLCPlaybackInfoSubtitlesFetcherViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCPlaybackInfoSubtitlesFetcherViewController.m; sourceTree = "<group>"; };
@@ -987,8 +987,8 @@
 		DD870E941CEF78D800BBD4FE /* VLCNetworkLoginDataSourceLogin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCNetworkLoginDataSourceLogin.m; path = Sources/LocalNetworkConnectivity/VLCNetworkLoginDataSourceLogin.m; sourceTree = SOURCE_ROOT; };
 		DD870E981CEF929A00BBD4FE /* VLCNetworkLoginViewFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCNetworkLoginViewFieldCell.h; path = Sources/LocalNetworkConnectivity/VLCNetworkLoginViewFieldCell.h; sourceTree = SOURCE_ROOT; };
 		DD870E991CEF929A00BBD4FE /* VLCNetworkLoginViewFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCNetworkLoginViewFieldCell.m; path = Sources/LocalNetworkConnectivity/VLCNetworkLoginViewFieldCell.m; sourceTree = SOURCE_ROOT; };
-		DD8F842F1B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "VLCPlaybackController+MediaLibrary.h"; path = "Sources/VLCPlaybackController+MediaLibrary.h"; sourceTree = SOURCE_ROOT; };
-		DD8F84301B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "VLCPlaybackController+MediaLibrary.m"; path = "Sources/VLCPlaybackController+MediaLibrary.m"; sourceTree = SOURCE_ROOT; };
+		DD8F842F1B00EB3B0009138A /* VLCPlaybackService+MediaLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "VLCPlaybackService+MediaLibrary.h"; path = "Sources/VLCPlaybackService+MediaLibrary.h"; sourceTree = SOURCE_ROOT; };
+		DD8F84301B00EB3B0009138A /* VLCPlaybackService+MediaLibrary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "VLCPlaybackService+MediaLibrary.m"; path = "Sources/VLCPlaybackService+MediaLibrary.m"; sourceTree = SOURCE_ROOT; };
 		DD9D8F5D1C00C73F00B4060F /* VLCDeleteHintTVView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCDeleteHintTVView.h; sourceTree = "<group>"; };
 		DD9D8F5E1C00C73F00B4060F /* VLCDeleteHintTVView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCDeleteHintTVView.m; sourceTree = "<group>"; };
 		DD9D8F621C01F96700B4060F /* VLCPlaybackInfoChaptersTVViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCPlaybackInfoChaptersTVViewController.h; sourceTree = "<group>"; };
@@ -1412,8 +1412,8 @@
 				E0BA21B822D7C8C700937CFD /* MediaPlaybackControlToolbar.swift */,
 				8D144D6122298E5800984C46 /* MiniPlayer */,
 				416443852048419E00CAC646 /* DeviceMotion.swift */,
-				DD8F842F1B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.h */,
-				DD8F84301B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.m */,
+				DD8F842F1B00EB3B0009138A /* VLCPlaybackService+MediaLibrary.h */,
+				DD8F84301B00EB3B0009138A /* VLCPlaybackService+MediaLibrary.m */,
 				7D37848D183A98B6009EE944 /* VLCMovieViewController.h */,
 				7D37848E183A98B6009EE944 /* VLCMovieViewController.m */,
 				7D378490183A98BF009EE944 /* VLCExternalDisplayController.h */,
@@ -1710,8 +1710,8 @@
 		7DEC8BE01BD686D3006E1093 /* Playback */ = {
 			isa = PBXGroup;
 			children = (
-				7DE56C181AD93F9100E8CA00 /* VLCPlaybackController.h */,
-				7DE56C191AD93F9100E8CA00 /* VLCPlaybackController.m */,
+				7DE56C181AD93F9100E8CA00 /* VLCPlaybackService.h */,
+				7DE56C191AD93F9100E8CA00 /* VLCPlaybackService.m */,
 				DD510B6E1B14E564003BA71C /* VLCPlayerDisplayController.h */,
 				DD510B6F1B14E564003BA71C /* VLCPlayerDisplayController.m */,
 				417D7F5E1F7BA26200DDF36A /* VLCRemoteControlService.h */,
@@ -2887,7 +2887,7 @@
 				DD3EABE91BE13D5B003668DA /* VLCRemoteBrowsingTVCell.m in Sources */,
 				7DEBF3791C075EBC007A4043 /* VLCPlaybackInfoSubtitlesFetcherViewController.m in Sources */,
 				DD3EABFD1BE14C4B003668DA /* UIViewController+VLCAlert.m in Sources */,
-				7D7EF3DD1BD5779F00CD4CEE /* VLCPlaybackController.m in Sources */,
+				7D7EF3DD1BD5779F00CD4CEE /* VLCPlaybackService.m in Sources */,
 				DD3EFF361BDEBCE500B68579 /* VLCLocalNetworkServiceBrowserNetService.m in Sources */,
 				419A2C681F37A4B70069D224 /* VLCStringsForLocalization.m in Sources */,
 				7DB174A71CD20D7B0085BCF0 /* VLCSearchableServerBrowsingTVViewController.m in Sources */,
@@ -2995,7 +2995,7 @@
 				8D2AD4D822786F4000393833 /* AddToPlaylistViewController.swift in Sources */,
 				7DC19ADF1868C7BB00810BF7 /* VLCFirstStepsViewController.m in Sources */,
 				DD3EFF331BDEBCE500B68579 /* VLCLocalNetworkServiceBrowserMediaDiscoverer.m in Sources */,
-				7DE56C1A1AD93F9100E8CA00 /* VLCPlaybackController.m in Sources */,
+				7DE56C1A1AD93F9100E8CA00 /* VLCPlaybackService.m in Sources */,
 				4152F1621FEF19BD00F1908B /* KeychainCoordinator.swift in Sources */,
 				41884A50214BE0D800D2C6B4 /* MediaCollectionViewCell.swift in Sources */,
 				7D5CAA891A4AD763003F2CBC /* VLCTrackSelectorTableViewCell.m in Sources */,
@@ -3011,7 +3011,7 @@
 				8DE1888C210B459000A091D2 /* ShowEpisodeModel.swift in Sources */,
 				4170152C209A1D3600802E44 /* MediaViewController.swift in Sources */,
 				41F9BC7C1F4F20E400268461 /* VLCTrackSelectorView.m in Sources */,
-				DD8F84311B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.m in Sources */,
+				DD8F84311B00EB3B0009138A /* VLCPlaybackService+MediaLibrary.m in Sources */,
 				418B144720179C00000447AA /* MediaCategoryViewController.swift in Sources */,
 				414327A521B6E55700B061F6 /* PlaybackSpeedView.swift in Sources */,
 				41EB91DD1F7BFF8500821AA5 /* VLCMetadata.m in Sources */,

vlc-ios/VLC-iOS-Bridging-Header.h

@@ -14,7 +14,7 @@
 #import "VLCDownloadViewController.h"
 #import "VLCEmptyLibraryView.h"
 #import "VLCOpenNetworkStreamViewController.h"
-#import "VLCPlaybackController+MediaLibrary.h"
+#import "VLCPlaybackService+MediaLibrary.h"
 #import "VLCPlaybackNavigationController.h"
 #import "VLCPlayerDisplayController.h"
 #import "VLCServerListViewController.h"