Skip to content

Commit b54b963

Browse files
m-absm-abs
committed
update deps and add ios target
1 parent 13b8760 commit b54b963

9 files changed

+713
-649
lines changed

‎.prettierrc.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"arrowParens": "always",
3+
"bracketSpacing": true,
4+
"printWidth": 160,
5+
"semi": true,
6+
"singleQuote": true,
7+
"tabWidth": 2,
8+
"trailingComma": "all"
9+
}

‎src/audioplayer.android.ts

+71-71
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
/// <reference path="./native-definitions/libvlc-service.d.ts" />
22

3-
import { CommonAudioPlayer, MediaTrack, Playlist, PlaybackEvent } from './audioplayer.common';
43
import * as app from 'tns-core-modules/application';
4+
import { CommonAudioPlayer, MediaTrack, PlaybackEvent, Playlist } from './audioplayer.common';
55

6-
export { MediaTrack, Playlist, PlaybackEvent } from './audioplayer.common';
6+
export { MediaTrack, PlaybackEvent, Playlist } from './audioplayer.common';
77

88
interface TNSConnectionCallback {
99
isConnected: boolean;
1010
}
11-
let TNSConnectionCallback: new (owner: WeakRef<TNSAudioPlayer>,
12-
resolve: (value?: any) => void,
13-
reject: (reason?: any) => void) => dk.nota.lyt.libvlc.ConnectionCallback;
11+
12+
let TNSConnectionCallback: new (
13+
owner: WeakRef<TNSAudioPlayer>,
14+
resolve: (value?: any) => void,
15+
reject: (reason?: any) => void,
16+
) => dk.nota.lyt.libvlc.ConnectionCallback;
1417

1518
function ensureTNSConnectionCallback() {
1619
if (TNSConnectionCallback) {
@@ -19,11 +22,9 @@ function ensureTNSConnectionCallback() {
1922

2023
@Interfaces([dk.nota.lyt.libvlc.ConnectionCallback])
2124
class TNSConnectionCallbackImpl extends java.lang.Object {
22-
23-
constructor(private owner: WeakRef<TNSAudioPlayer>,
24-
private resolve: (value?: any) => void,
25-
private reject: (reason?: any) => void) {
25+
constructor(private owner: WeakRef<TNSAudioPlayer>, private resolve: (value?: any) => void, private reject: (reason?: any) => void) {
2626
super();
27+
2728
return global.__native(this);
2829
}
2930

@@ -47,8 +48,7 @@ function ensureTNSConnectionCallback() {
4748
TNSConnectionCallback = TNSConnectionCallbackImpl;
4849
}
4950

50-
export class TNSAudioPlayer extends CommonAudioPlayer
51-
{
51+
export class TNSAudioPlayer extends CommonAudioPlayer {
5252
public service: dk.nota.lyt.libvlc.PlaybackService;
5353

5454
private _serviceHelper: dk.nota.lyt.libvlc.PlaybackServiceHelper;
@@ -73,16 +73,16 @@ export class TNSAudioPlayer extends CommonAudioPlayer
7373
}
7474

7575
public onConnected(service: dk.nota.lyt.libvlc.PlaybackService) {
76-
this._log("PlaybackService - Connected");
76+
this._log('PlaybackService - Connected');
7777
this.setupServiceCallbacks(service);
7878
this.service = service;
7979
if (service.getMediaListIdentifier()) {
80-
this._log("- existing playlist ID: "+ service.getMediaListIdentifier());
80+
this._log('- existing playlist ID: ' + service.getMediaListIdentifier());
8181
}
8282
}
8383

8484
public onDisconnected() {
85-
this._log("PlaybackService - Disconnected");
85+
this._log('PlaybackService - Disconnected');
8686
// NOTE: avoid recursive onDisconnected calls
8787
if (!this.service) {
8888
return;
@@ -94,7 +94,7 @@ export class TNSAudioPlayer extends CommonAudioPlayer
9494
}
9595

9696
private setupServiceCallbacks(service: dk.nota.lyt.libvlc.PlaybackService) {
97-
service.setNotificationActivity(app.android.startActivity, "LAUNCHED_FROM_NOTIFICATION");
97+
service.setNotificationActivity(app.android.startActivity, 'LAUNCHED_FROM_NOTIFICATION');
9898
service.removeAllCallbacks();
9999
service.addCallback(this.lytPlaybackEventHandler);
100100
}
@@ -121,7 +121,7 @@ export class TNSAudioPlayer extends CommonAudioPlayer
121121
mediaList.add(this.getNewMediaWrapper(track));
122122
}
123123
this.service.load(mediaList);
124-
this._log('Set playlist identifier = '+ playlist.UID);
124+
this._log('Set playlist identifier = ' + playlist.UID);
125125
this.service.setMediaListIdentifier(playlist.UID);
126126
}
127127
}
@@ -257,64 +257,64 @@ export class TNSAudioPlayer extends CommonAudioPlayer
257257
}
258258

259259
private lytPlaybackEventHandler = new dk.nota.lyt.libvlc.PlaybackEventHandler({
260-
update: () => {
261-
// this._log('update');
262-
},
263-
updateProgress: () => {
264-
// this._log('progress');
265-
},
266-
onMediaEvent: (event: dk.nota.lyt.libvlc.media.MediaEvent) => {
267-
// this._log('mediaEvent: '+ event.type);
268-
if (event.type == dk.nota.lyt.libvlc.media.MediaEvent.MetaChanged) {
269-
// this._log('^ MetaChanged ==');
270-
} else if (event.type == dk.nota.lyt.libvlc.media.MediaEvent.ParsedChanged) {
271-
// this._log('^ ParsedChanged ==');
272-
} else if (event.type == dk.nota.lyt.libvlc.media.MediaEvent.StateChanged) {
273-
// this._log('^ StateChanged ==');
260+
update: () => {
261+
// this._log('update');
262+
},
263+
updateProgress: () => {
264+
// this._log('progress');
265+
},
266+
onMediaEvent: (event: dk.nota.lyt.libvlc.media.MediaEvent) => {
267+
// this._log('mediaEvent: '+ event.type);
268+
if (event.type == dk.nota.lyt.libvlc.media.MediaEvent.MetaChanged) {
269+
// this._log('^ MetaChanged ==');
270+
} else if (event.type == dk.nota.lyt.libvlc.media.MediaEvent.ParsedChanged) {
271+
// this._log('^ ParsedChanged ==');
272+
} else if (event.type == dk.nota.lyt.libvlc.media.MediaEvent.StateChanged) {
273+
// this._log('^ StateChanged ==');
274+
}
275+
},
276+
onMediaPlayerEvent: (event: dk.nota.lyt.libvlc.media.MediaPlayerEvent) => {
277+
const PlayerEvent = dk.nota.lyt.libvlc.media.MediaPlayerEvent;
278+
//TODO: Simplify: VLCToClientEventMap
279+
if (event.type == PlayerEvent.SeekableChanged) {
280+
if (event.getSeekable() == true && this._queuedSeekTo !== null) {
281+
this._log('Executing queued SeekTo: ' + this._queuedSeekTo);
282+
this.seekTo(this._queuedSeekTo);
283+
this._queuedSeekTo = null;
274284
}
275-
},
276-
onMediaPlayerEvent: (event: dk.nota.lyt.libvlc.media.MediaPlayerEvent) => {
277-
const PlayerEvent = dk.nota.lyt.libvlc.media.MediaPlayerEvent;
278-
//TODO: Simplify: VLCToClientEventMap
279-
if (event.type == PlayerEvent.SeekableChanged) {
280-
if (event.getSeekable() == true && this._queuedSeekTo !== null) {
281-
this._log('Executing queued SeekTo: '+ this._queuedSeekTo);
282-
this.seekTo(this._queuedSeekTo);
283-
this._queuedSeekTo = null;
284-
}
285-
} else if (event.type == PlayerEvent.PausableChanged) {
286-
} else if (event.type == PlayerEvent.TimeChanged) {
287-
this._onPlaybackEvent(PlaybackEvent.TimeChanged, event.getTimeChanged());
288-
} else if (event.type == PlayerEvent.MediaChanged) {
289-
} else if (event.type == PlayerEvent.Opening) {
290-
this._onPlaybackEvent(PlaybackEvent.Buffering);
291-
} else if (event.type == PlayerEvent.Playing) {
292-
this._onPlaybackEvent(PlaybackEvent.Playing);
293-
} else if (event.type == PlayerEvent.Paused) {
294-
this._onPlaybackEvent(PlaybackEvent.Paused);
295-
} else if (event.type == PlayerEvent.Stopped) {
296-
this._onPlaybackEvent(PlaybackEvent.Stopped);
297-
} else if (event.type == PlayerEvent.EndReached) {
298-
this._onPlaybackEvent(PlaybackEvent.EndOfTrackReached);
299-
if (this.getCurrentPlaylistIndex() >= this.playlist.length - 1) {
300-
this._onPlaybackEvent(PlaybackEvent.EndOfPlaylistReached);
301-
}
302-
} else if (event.type == PlayerEvent.SleepTimerChanged) {
303-
this._onPlaybackEvent(PlaybackEvent.SleepTimerChanged);
304-
} else if (event.type == PlayerEvent.WaitingForNetwork) {
305-
this._onPlaybackEvent(PlaybackEvent.WaitingForNetwork);
306-
} else if (event.type == PlayerEvent.Buffering) {
307-
// This only tells % of the buffer-size required to start playback
308-
//this._onPlaybackEvent(PlaybackEvent.Buffering, event.getBuffering());
309-
} else if (event.type == PlayerEvent.EncounteredError) {
310-
this._log('PlayerEvent.EncounteredError');
311-
this._onPlaybackEvent(PlaybackEvent.EncounteredError);
312-
//throw new Error("Android PlaybackService encountered an error");
313-
} else {
314-
// this._log('^ Unhandled PlayerEvent: '+ event.type);
285+
} else if (event.type == PlayerEvent.PausableChanged) {
286+
} else if (event.type == PlayerEvent.TimeChanged) {
287+
this._onPlaybackEvent(PlaybackEvent.TimeChanged, event.getTimeChanged());
288+
} else if (event.type == PlayerEvent.MediaChanged) {
289+
} else if (event.type == PlayerEvent.Opening) {
290+
this._onPlaybackEvent(PlaybackEvent.Buffering);
291+
} else if (event.type == PlayerEvent.Playing) {
292+
this._onPlaybackEvent(PlaybackEvent.Playing);
293+
} else if (event.type == PlayerEvent.Paused) {
294+
this._onPlaybackEvent(PlaybackEvent.Paused);
295+
} else if (event.type == PlayerEvent.Stopped) {
296+
this._onPlaybackEvent(PlaybackEvent.Stopped);
297+
} else if (event.type == PlayerEvent.EndReached) {
298+
this._onPlaybackEvent(PlaybackEvent.EndOfTrackReached);
299+
if (this.getCurrentPlaylistIndex() >= this.playlist.length - 1) {
300+
this._onPlaybackEvent(PlaybackEvent.EndOfPlaylistReached);
315301
}
302+
} else if (event.type == PlayerEvent.SleepTimerChanged) {
303+
this._onPlaybackEvent(PlaybackEvent.SleepTimerChanged);
304+
} else if (event.type == PlayerEvent.WaitingForNetwork) {
305+
this._onPlaybackEvent(PlaybackEvent.WaitingForNetwork);
306+
} else if (event.type == PlayerEvent.Buffering) {
307+
// This only tells % of the buffer-size required to start playback
308+
//this._onPlaybackEvent(PlaybackEvent.Buffering, event.getBuffering());
309+
} else if (event.type == PlayerEvent.EncounteredError) {
310+
this._log('PlayerEvent.EncounteredError');
311+
this._onPlaybackEvent(PlaybackEvent.EncounteredError);
312+
//throw new Error("Android PlaybackService encountered an error");
313+
} else {
314+
// this._log('^ Unhandled PlayerEvent: '+ event.type);
316315
}
317-
});
316+
},
317+
});
318318

319319
private isServiceRunning(serviceClassName: string) {
320320
const manager: android.app.ActivityManager = app.android.context.getSystemService(android.content.Context.ACTIVITY_SERVICE);

‎src/audioplayer.common.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as app from 'tns-core-modules/application';
21
import { isIOS } from 'tns-core-modules/platform';
32

43
export class MediaTrack {
@@ -57,7 +56,6 @@ export interface PlaybackEventListener {
5756
}
5857

5958
export abstract class CommonAudioPlayer {
60-
6159
public android: any;
6260
public ios: any;
6361
public playlist: Playlist;

‎src/audioplayer.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ export class TNSAudioPlayer {
2828
getSleepTimerRemaining(): number;
2929
cancelSleepTimer(): any;
3030
destroy(): void;
31-
}
31+
}

0 commit comments

Comments
 (0)