Skip to content

Commit 24ef7f9

Browse files
committed
SGAsset: Rename demuxer.
1 parent 1564cf9 commit 24ef7f9

6 files changed

Lines changed: 7 additions & 7 deletions

File tree

SGPlayer/Classes/Core/SGAsset/SGAsset+Internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
@interface SGAsset ()
1313

1414
/*!
15-
@method newDemuxable
15+
@method newDemuxer
1616
@abstract
1717
Create a new demuxer.
1818
*/
19-
- (id<SGDemuxable>)newDemuxable;
19+
- (id<SGDemuxable>)newDemuxer;
2020

2121
@end

SGPlayer/Classes/Core/SGAsset/SGAsset.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ - (id)copyWithZone:(NSZone *)zone
2323
return obj;
2424
}
2525

26-
- (id<SGDemuxable>)newDemuxable
26+
- (id<SGDemuxable>)newDemuxer
2727
{
2828
NSAssert(NO, @"Subclass only.");
2929
return nil;

SGPlayer/Classes/Core/SGAsset/SGMutableAsset.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ - (SGMutableTrack *)addTrack:(SGMediaType)type
5050
return obj;
5151
}
5252

53-
- (id<SGDemuxable>)newDemuxable
53+
- (id<SGDemuxable>)newDemuxer
5454
{
5555
NSMutableArray *demuxables = [NSMutableArray array];
5656
for (SGMutableTrack *obj in self->_tracks) {

SGPlayer/Classes/Core/SGAsset/SGURLAsset.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ - (instancetype)initWithURL:(NSURL *)URL
2727
return self;
2828
}
2929

30-
- (id<SGDemuxable>)newDemuxable
30+
- (id<SGDemuxable>)newDemuxer
3131
{
3232
return [[SGURLDemuxer alloc] initWithURL:self->_URL];
3333
}

SGPlayer/Classes/Core/SGSession/SGFrameReader.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ @implementation SGFrameReader
3838
- (instancetype)initWithAsset:(SGAsset *)asset
3939
{
4040
if (self = [super init]) {
41-
self->_demuxer = [asset newDemuxable];
41+
self->_demuxer = [asset newDemuxer];
4242
self->_demuxer.delegate = self;
4343
self->_demuxer.options = [SGOptions sharedOptions].demuxer.copy;
4444
self->_decoderOptions = [SGOptions sharedOptions].decoder.copy;

SGPlayer/Classes/Core/SGSession/SGPacketOutput.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ - (instancetype)initWithAsset:(SGAsset *)asset
4242
if (self = [super init]) {
4343
self->_lock = [[NSLock alloc] init];
4444
self->_wakeup = [[NSCondition alloc] init];
45-
self->_demuxable = [asset newDemuxable];
45+
self->_demuxable = [asset newDemuxer];
4646
self->_demuxable.delegate = self;
4747
self->_demuxable.options = [SGOptions sharedOptions].demuxer.copy;
4848
}

0 commit comments

Comments
 (0)