github-starred/CocoaSplit
2
0
Fork 0
mirror of https://github.com/zakk4223/CocoaSplit.git synced 2026-05-17 06:05:50 -06:00
Code Issues 32 Projects Packages Wiki Activity Actions

Stream Services now have a dedicated base class, no longer combined with an output writer

Browse source 
Stream Services now have a method that returns a new instance of a CSOutputWriterProtocol compliant class, the base class creates a CSOutputBase for you.
This commit is contained in:
Zakk 2018-01-20 23:23:33 -05:00
parent 29637a3c01
commit 4e58ecb47a
12 changed files with 131 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CocoaSplit.xcodeproj/project.pbxproj
View file

@ -179,6 +179,8 @@
34A629451FBB6DC500B4E16A /* CSJSAnimationDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A629441FBB6DC500B4E16A /* CSJSAnimationDelegate.m */; };
34A64A2F165EFE4C00A68428 /* PreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A64A2E165EFE4B00A68428 /* PreviewView.m */; };
34A64A37165F208800A68428 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A64A36165F208800A68428 /* QuartzCore.framework */; };
34A77455201449450036F8B5 /* CSStreamServiceBase.h in Sources */ = {isa = PBXBuildFile; fileRef = 34A77454201449450036F8B5 /* CSStreamServiceBase.h */; };
34A77457201449C30036F8B5 /* CSStreamServiceBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A77456201449C30036F8B5 /* CSStreamServiceBase.m */; };
34A7ADB81C01EF1400685044 /* CompressionSettingsPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A7ADB71C01EF1400685044 /* CompressionSettingsPanelController.m */; };
34A7C1AD19B9A57600BC6882 /* CSLayoutSwitcherExtraPlugin.bundle in Copy Files */ = {isa = PBXBuildFile; fileRef = 34A7C1A119B9A41A00BC6882 /* CSLayoutSwitcherExtraPlugin.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
34AB1C311B944F48003F2C03 /* CSPreviewOverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AB1C301B944F48003F2C03 /* CSPreviewOverlayView.m */; };
@ -884,6 +886,8 @@
34A64A36165F208800A68428 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
34A7745220141DF70036F8B5 /* CSOutputWriterProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSOutputWriterProtocol.h; path = PluginHeaders/CSOutputWriterProtocol.h; sourceTree = "<group>"; };
34A77453201442B60036F8B5 /* CapturedFrameData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CapturedFrameData.h; path = PluginHeaders/CapturedFrameData.h; sourceTree = "<group>"; };
34A77454201449450036F8B5 /* CSStreamServiceBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CSStreamServiceBase.h; path = PluginHeaders/CSStreamServiceBase.h; sourceTree = "<group>"; };
34A77456201449C30036F8B5 /* CSStreamServiceBase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CSStreamServiceBase.m; sourceTree = "<group>"; };
34A7ADB61C01EF1400685044 /* CompressionSettingsPanelController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CompressionSettingsPanelController.h; path = Interface/CompressionSettingsPanelController.h; sourceTree = "<group>"; };
34A7ADB71C01EF1400685044 /* CompressionSettingsPanelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CompressionSettingsPanelController.m; path = Interface/CompressionSettingsPanelController.m; sourceTree = "<group>"; };
34A7C17A19B98EA200BC6882 /* CSExtraPluginProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSExtraPluginProtocol.h; path = PluginHeaders/CSExtraPluginProtocol.h; sourceTree = "<group>"; };
@ -1410,6 +1414,7 @@
346544DE1FC24248003B9991 /* NSImage+tintedImage.m */,
346544E01FC2457E003B9991 /* CSNSImageCellThemed.h */,
346544E11FC2457E003B9991 /* CSNSImageCellThemed.m */,
34A77456201449C30036F8B5 /* CSStreamServiceBase.m */,
);
path = CocoaSplit;
sourceTree = "<group>";
@ -1713,6 +1718,7 @@
34EA822C1D3C568400928A06 /* CSOauth2Authenticator.h */,
3408234619BC50AD00CD1F5F /* CSNotifications.h */,
34DBBAB2201412FC00B3DFFD /* CSOutputBase.h */,
34A77454201449450036F8B5 /* CSStreamServiceBase.h */,
);
name = PluginHeaders;
sourceTree = "<group>";
@ -2759,6 +2765,7 @@
34ED8C711B07371C002C0674 /* MIKMIDIMappingManager.m in Sources */,
3481F30619B48C7C00CC76D8 /* SourceLayout+ScriptingAdditions.m in Sources */,
34EAFB6F1A1A137600E12FBD /* CSMeterCell.m in Sources */,
34A77457201449C30036F8B5 /* CSStreamServiceBase.m in Sources */,
34D2D5771A547C35001004E5 /* CSTextCaptureViewControllerBase.m in Sources */,
34B5FCDF19BF1C3F00F67D19 /* CreateLayoutViewController.m in Sources */,
34788DDB1EF5996000C3C9C5 /* CATransaction+JSExtensions.m in Sources */,
@ -2846,6 +2853,7 @@
34A7ADB81C01EF1400685044 /* CompressionSettingsPanelController.m in Sources */,
34DC2FB01B512362008F12A2 /* CSCaptureBase+TimerDelegate.m in Sources */,
34ED8C791B07371C002C0674 /* MIKMIDIMetaEvent.m in Sources */,
34A77455201449450036F8B5 /* CSStreamServiceBase.h in Sources */,
34F52A2B1BC1E0F900662911 /* CSLayoutButton.m in Sources */,
34576C7819AFCA1B007BAD90 /* CSPluginLoader.m in Sources */,
34FDD6F21A215268009A7413 /* CSPluginServices.m in Sources */,

75
CocoaSplit/CSStreamServiceBase.m Normal file
View file

@ -0,0 +1,75 @@
//
// CSStreamServiceBase.m
// CocoaSplit
//
// Created by Zakk on 1/20/18.
//
#import <Foundation/Foundation.h>
#import "CSStreamServiceBase.h"
#import "CSOutputBase.h"
@implementation CSStreamServiceBase
-(NSViewController *)getConfigurationView
{
return nil;
}
-(NSString *)getServiceDestination
{
return nil;
}
-(NSString *)getServiceFormat
{
return nil;
}
+(NSString *)label
{
return nil;
}
+(NSString *)serviceDescription
{
return nil;
}
+(NSImage *)serviceImage
{
return nil;
}
-(NSObject<CSOutputWriterProtocol> *)createOutput;
{
return [[CSOutputBase alloc] init];
}
-(void)prepareForStreamStart
{
return;
}
- (void)encodeWithCoder:(nonnull NSCoder *)aCoder {
return;
}
- (nullable instancetype)initWithCoder:(nonnull NSCoder *)aDecoder {
return [self init];
}
@synthesize isReady;
@end

5
CocoaSplit/OutputDestination.h
View file

@ -3,7 +3,6 @@
// H264Streamer
//
// Created by Zakk on 9/16/12.
// Copyright (c) 2012 Zakk. All rights reserved.
//
#import <Foundation/Foundation.h>
@ -11,7 +10,7 @@
#import "VideoCompressor.h"
#import "CaptureController.h"
#import "CSLayoutRecorderInfoProtocol.h"
#import "CSOutputBase.h"
#import "CSStreamServiceProtocol.h"
@ -56,7 +55,7 @@
@property (strong) NSString *output_format;
@property (strong) NSString *stream_key;
@property (assign) int stream_delay;
@property (strong) CSOutputBase *ffmpeg_out;
@property (strong) NSObject<CSOutputWriterProtocol> *ffmpeg_out;
@property (weak) id<CSLayoutRecorderInfoProtocol> settingsController;
@property (strong) NSColor *textColor;
@property (assign) NSUInteger delay_buffer_frames;

12
CocoaSplit/OutputDestination.m
View file

@ -3,7 +3,6 @@
// H264Streamer
//
// Created by Zakk on 9/16/12.
// Copyright (c) 2012 Zakk. All rights reserved.
//
#import "OutputDestination.h"
@ -35,7 +34,6 @@
-(void) encodeWithCoder:(NSCoder *)aCoder
{
[aCoder encodeObject:self.name forKey:@"name"];
[aCoder encodeObject:self.type_name forKey:@"type_name"];
[aCoder encodeObject:self.type_class_name forKey:@"type_class_name"];
@ -353,7 +351,7 @@
-(void) attachOutput
{
CSOutputBase *newout;
NSObject<CSOutputWriterProtocol> *newout;
if (!self.active)
{
return;
@ -361,8 +359,12 @@
if (!self.ffmpeg_out)
{
newout = [[CSOutputBase alloc] init];
if (self.streamServiceObject)
{
newout = [self.streamServiceObject createOutput];
} else {
newout = [[CSOutputBase alloc] init];
}
} else {
newout = self.ffmpeg_out;
}

25
CocoaSplit/PluginHeaders/CSStreamServiceBase.h Normal file
View file

@ -0,0 +1,25 @@
//
// CSStreamServiceBase.m
// CocoaSplit
//
// Created by Zakk on 1/20/18.
//
#import <Foundation/Foundation.h>
#import "CSStreamServiceProtocol.h"
@interface CSStreamServiceBase : NSObject <CSStreamServiceProtocol, NSCoding>
-(NSViewController *)getConfigurationView;
-(NSString *)getServiceDestination;
-(NSString *)getServiceFormat;
+(NSString *)label;
+(NSString *)serviceDescription;
+(NSImage *)serviceImage;
-(NSObject<CSOutputWriterProtocol> *)createOutput;
-(void)prepareForStreamStart;
@end

3
CocoaSplit/PluginHeaders/CSStreamServiceProtocol.h
View file

@ -9,7 +9,7 @@
#import <Cocoa/Cocoa.h>
#import "CSOutputWriterProtocol.h"
@protocol CSStreamServiceProtocol <NSObject, NSCoding, CSOutputWriterProtocol>
@protocol CSStreamServiceProtocol <NSObject, NSCoding>
@property bool isReady;
@ -19,6 +19,7 @@
+(NSString *)label;
+(NSString *)serviceDescription;
+(NSImage *)serviceImage;
-(NSObject<CSOutputWriterProtocol> *)createOutput;
-(void)prepareForStreamStart;

4
StreamServicePlugins/CSFileStreamServicePlugin/CSFileStreamServicePlugin/CSFileStreamRTMPService.h
View file

@ -7,9 +7,9 @@
#import <Foundation/Foundation.h>
#import "CSStreamServiceProtocol.h"
#import "CSOutputBase.h"
#import "CSStreamServiceBase.h"
@interface CSFileStreamRTMPService : CSOutputBase <CSStreamServiceProtocol>
@interface CSFileStreamRTMPService : CSStreamServiceBase <CSStreamServiceProtocol>
@property bool isReady;

4
StreamServicePlugins/CSFileStreamServicePlugin/CSFileStreamServicePlugin/FileStreamService.h
View file

@ -7,9 +7,9 @@
#import <Foundation/Foundation.h>
#import "CSStreamServiceProtocol.h"
#import "CSOutputBase.h"
#import "CSStreamServiceBase.h"
@interface FileStreamService : CSOutputBase <CSStreamServiceProtocol>
@interface FileStreamService : CSStreamServiceBase <CSStreamServiceProtocol>
@property bool isReady;

4
StreamServicePlugins/CSHitboxStreamServicePlugin/CSHitboxStreamServicePlugin/HitboxStreamService.h
View file

@ -7,11 +7,11 @@
#import <Foundation/Foundation.h>
#import "CSStreamServiceProtocol.h"
#import "CSOutputBase.h"
#import "CSStreamServiceBase.h"
#define HITBOX_API_BASE "https://api.hitbox.tv/"
@interface HitboxStreamService : CSOutputBase <CSStreamServiceProtocol>
@interface HitboxStreamService : CSStreamServiceBase <CSStreamServiceProtocol>
@property bool isReady;

4
StreamServicePlugins/CSTwitchStreamServicePlugin/TwitchStreamService.h
View file

@ -9,9 +9,9 @@
#import "CSStreamServiceProtocol.h"
#import "CSPluginServices.h"
#import "CSOauth2Authenticator.h"
#import "CSOutputBase.h"
#import "CSStreamServiceBase.h"
@interface TwitchStreamService : CSOutputBase <CSStreamServiceProtocol>
@interface TwitchStreamService : CSStreamServiceBase <CSStreamServiceProtocol>
{
NSString *_oauth_client_id;
bool _key_fetch_pending;

4
StreamServicePlugins/CSVaughnliveStreamServicePlugin/CSVaughnliveStreamServicePlugin/CSVaughnliveStreamService.h
View file

@ -7,12 +7,12 @@
#import <Foundation/Foundation.h>
#import "CSStreamServiceProtocol.h"
#import "CSOutputBase.h"
#import "CSStreamServiceBase.h"
#define INGEST_URL @"rtmp://live.vaughnlive.tv:443/live/"
@interface CSVaughnliveStreamService : CSOutputBase <CSStreamServiceProtocol>
@interface CSVaughnliveStreamService : CSStreamServiceBase <CSStreamServiceProtocol>
{
NSString *_ingestURL;
}

4
StreamServicePlugins/CSYoutubeStreamServicePlugin/CSYoutubeStreamServicePlugin/CSYoutubeStreamService.h
View file

@ -9,9 +9,9 @@
#import "CSStreamServiceProtocol.h"
#import "CSPluginServices.h"
#import "CSOauth2Authenticator.h"
#import "CSOutputBase.h"
#import "CSStreamServiceBase.h"
@interface CSYoutubeStreamService : CSOutputBase <CSStreamServiceProtocol>
@interface CSYoutubeStreamService : CSStreamServiceBase <CSStreamServiceProtocol>
{
NSString *_currentStreamDest;
bool _destination_fetch_pending;