Skip to content

Use some additional bindings in media player #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdehaussy wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Use some additional bindings in media player #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aacefda
Added seek in ms capabilities
mdehaussy Feb 5, 2014
08c1d3e
Update mediaplayer.js
mdehaussy Feb 5, 2014
dc4a708
method to set output window of media player added
mdehaussy Feb 7, 2014
0c83b3d
Update mediaplayer.js
mdehaussy Feb 7, 2014
cb61afe
mediaplayer set/getTime and set/getPosition
mdehaussy Feb 14, 2014
853f9b4
fix set/getTime types
mdehaussy Feb 14, 2014
2856f21
fix standard C lib loading on windows
mdehaussy Mar 10, 2014
c636c1f
feat(fullscreen): add fullscreen toggle on mediaPlayer
mgcrea Sep 3, 2014
83270ea
chore(jshint): make jshint happy
mgcrea Sep 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/libvlc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ exports.initialize = function(paths) {
libvlc_audio_set_format_callbacks: ['void', ['pointer', 'pointer', 'pointer']],
libvlc_audio_set_format: ['void', ['pointer', 'string', 'uint32', 'uint32']],
libvlc_media_player_get_length: ['longlong', ['pointer']],
libvlc_media_player_get_time: ['longlong', ['pointer']],
libvlc_media_player_set_time: ['void', ['pointer', 'longlong']],
libvlc_media_player_get_time: [ref.types.int64, ['pointer']],
libvlc_media_player_set_time: ['void', ['pointer', ref.types.int64]],
libvlc_media_player_get_position: ['float', ['pointer']],
libvlc_media_player_set_position: ['void', ['pointer', 'float']],
libvlc_media_player_set_chapter: ['void', ['pointer', 'int32']],
Expand Down
9 changes: 8 additions & 1 deletion lib/media.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,17 @@ var trackType = {
}

var ffi = require('ffi')
var libc = ffi.Library(null, {
if (process.platform == 'win32') {
var libcname = 'msvcrt';
} else {
var libcname = null;
}

var libc = ffi.Library(libcname, {
'free': ['void', [ 'pointer' ]],
});


var VALID_EVENTS = {
MetaChanged: 0,
SubItemAdded: 1,
Expand Down
41 changes: 39 additions & 2 deletions lib/mediaplayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ var event_handler = function(e, d) {
case 0x112:
arg = union.media_player_vout.new_count;
break;
};
}

obj.emit(name, arg);
};
Expand All @@ -124,6 +124,7 @@ var MediaPlayer = module.exports = function (parent) {

this.parent = parent;
this.instance = lib.libvlc_media_player_new(parent);
//this._vlcexcep = lib.libvlc_exception_init()

this.release = function () {
if (!released) {
Expand Down Expand Up @@ -174,6 +175,42 @@ var MediaPlayer = module.exports = function (parent) {
lib.libvlc_media_player_stop(self.instance);
};

this.seek = function (seek) {
lib.libvlc_media_player_set_time(self.instance, seek);
};

this.setX11Window = function (wid) {
lib.libvlc_media_player_set_xwindow(self.instance, wid);
};

this.setOSXWindow = function(nsobject) {
lib.libvlc_media_player_set_drawable(self.instance, nsobject, 0);
};

this.setWin32Window = function(hwnd) {
lib.libvlc_media_player_set_drawable(self.instance, hwnd, 0);
};

this.setTime = function (mstime) {
lib.libvlc_media_player_set_time(self.instance, mstime);
};

this.setPosition = function (percentpostion) {
lib.libvlc_media_player_set_position(self.instance, percentpostion);
};

this.getTime = function() {
return lib.libvlc_media_player_get_time(self.instance);
};

this.getPosition = function () {
return lib.libvlc_media_player_get_position(self.instance);
};

this.setFullscreen = function () {
lib.libvlc_set_fullscreen(self.instance, 1);
};

var _on = this.on;
this.on = function (e, cb) {
var tmp;
Expand All @@ -184,7 +221,7 @@ var MediaPlayer = module.exports = function (parent) {
if (VALID_EVENTS[e] !== undefined) {
if (!self._events || !self._events[e]) {
tmp = lib.libvlc_event_attach(eventmgr, VALID_EVENTS[e], eventcb, selfref);
if (tmp != 0) util.throw();
if (tmp !== 0) util.throw();
}
_on.call(self, e, cb);
} else {
Expand Down