Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并pr：#1025

Browse Source
This commit is contained in:
ziyue
2021-08-12 16:07:31 +08:00
parent 30b139eaf0
commit 4dbe0a1d3e
26 changed files with 303 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
api/source/mk_media.cpp
View File

@@ -76,24 +76,24 @@ protected:
return true;
}
bool seekTo(MediaSource &sender,uint32_t ui32Stamp) override{
if(!_on_seek){
bool seekTo(MediaSource &sender, uint32_t stamp) override {
if (!_on_seek) {
return false;
}
return _on_seek(_on_seek_data,ui32Stamp);
return _on_seek(_on_seek_data, stamp);
}
// 通知暂停
bool pause(MediaSource &sender) override {
if (!_on_pause)
{
// 通知暂停或恢复
bool pause(MediaSource &sender, bool pause) override {
if (!_on_pause) {
return false;
}
return _on_pause(_on_pause_data);
return _on_pause(_on_pause_data, pause);
}
//通知倍数播放
bool speed(MediaSource& sender, float speed) override {
if (!_on_speed)
{
bool speed(MediaSource &sender, float speed) override {
if (!_on_speed) {
return false;
}
return _on_speed(_on_pause_data, speed);
@@ -130,23 +130,21 @@ API_EXPORT void API_CALL mk_media_set_on_close(mk_media ctx, on_mk_media_close c
(*obj)->setOnClose(cb, user_data);
}
API_EXPORT void API_CALL mk_media_set_on_seek(mk_media ctx, on_mk_media_seek cb, void *user_data){
API_EXPORT void API_CALL mk_media_set_on_seek(mk_media ctx, on_mk_media_seek cb, void *user_data) {
assert(ctx);
MediaHelper::Ptr *obj = (MediaHelper::Ptr *) ctx;
(*obj)->setOnSeek(cb, user_data);
}
API_EXPORT void API_CALL mk_media_set_on_pause(mk_media ctx, on_mk_media_pause cb, void* user_data)
{
API_EXPORT void API_CALL mk_media_set_on_pause(mk_media ctx, on_mk_media_pause cb, void *user_data) {
assert(ctx);
MediaHelper::Ptr* obj = (MediaHelper::Ptr*) ctx;
MediaHelper::Ptr *obj = (MediaHelper::Ptr *) ctx;
(*obj)->setOnPause(cb, user_data);
}
API_EXPORT void API_CALL mk_media_set_on_speed(mk_media ctx, on_mk_media_speed cb, void* user_data)
{
API_EXPORT void API_CALL mk_media_set_on_speed(mk_media ctx, on_mk_media_speed cb, void *user_data) {
assert(ctx);
MediaHelper::Ptr* obj = (MediaHelper::Ptr*) ctx;
MediaHelper::Ptr *obj = (MediaHelper::Ptr *) ctx;
(*obj)->setOnSpeed(cb, user_data);
}