Skip to content

Commit 627d616

Browse files
committed
[wrapper] Rename Player::OnVideoDimension to Player::OnVideoDimensions
1 parent 4a94775 commit 627d616

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

dartvlc/internal/events.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ class PlayerEvents : public PlayerGetters {
2525
std::bind(&PlayerEvents::OnPlayCallback, this));
2626
}
2727

28-
void OnVideoDimension(std::function<void(int32_t, int32_t)> callback) {
28+
void OnVideoDimensions(std::function<void(int32_t, int32_t)> callback) {
2929
video_dimension_callback_ = callback;
3030
vlc_media_player_.eventManager().onPlaying(
31-
std::bind(&PlayerEvents::OnVideoDimensionCallback, this));
31+
std::bind(&PlayerEvents::OnVideoDimensionsCallback, this));
3232
}
3333

3434
void OnPause(std::function<void()> callback) {
@@ -117,7 +117,7 @@ class PlayerEvents : public PlayerGetters {
117117
std::function<void(int32_t, int32_t)> video_dimension_callback_ = [=](
118118
int32_t, int32_t) -> void {};
119119

120-
void OnVideoDimensionCallback() {
120+
void OnVideoDimensionsCallback() {
121121
int32_t video_width = preferred_video_width_.has_value()
122122
? preferred_video_width_.value()
123123
: libvlc_video_get_width(vlc_media_player_.get());

dartvlc/player.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ auto TO_CHARARRAY = [](std::vector<std::string>& vector) -> char** {
2424
class Player : public PlayerSetters {
2525
public:
2626
Player(std::vector<std::string> cmd_arguments = {}) {
27-
cmd_arguments.emplace_back("--no-video");
2827
if (cmd_arguments.empty()) {
2928
vlc_instance_ = VLC::Instance(0, nullptr);
3029
} else {

ffi/lib/src/internal/ffi.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ final ReceivePort receiver = new ReceivePort()
289289
.add(players[playerId]!.general);
290290
break;
291291
}
292-
case 'videoDimensionEvent':
292+
case 'videoDimensionsEvent':
293293
{
294294
players[playerId]!.videoDimensions =
295295
VideoDimensions(int.parse(event[2]), int.parse(event[3]));

ffi/native/dart_vlc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ DLLEXPORT void PlayerCreate(int32_t id, int32_t video_width,
5959
player->OnPosition([=](int32_t) -> void { OnPosition(id, player->state()); });
6060
player->OnOpen([=](VLC::Media) -> void { OnOpen(id, player->state()); });
6161
player->OnPlaylist([=]() -> void { OnOpen(id, player->state()); });
62-
player->OnVideoDimension(
62+
player->OnVideoDimensions(
6363
[=](int32_t video_width, int32_t video_height) -> void {
64-
OnVideoDimension(id, video_width, video_height);
64+
OnVideoDimensions(id, video_width, video_height);
6565
});
6666
#ifdef _WIN32
6767
/* Windows: Texture & flutter::TextureRegistrar */

ffi/native/eventmanager.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ inline void OnOpen(int32_t id, PlayerState* state) {
6666
CallbackStringArray(event);
6767
}
6868

69-
inline void OnVideoDimension(int32_t id, int32_t video_width,
70-
int32_t video_height) {
71-
std::vector<std::string> event{std::to_string(id), "videoDimensionEvent",
69+
inline void OnVideoDimensions(int32_t id, int32_t video_width,
70+
int32_t video_height) {
71+
std::vector<std::string> event{std::to_string(id), "videoDimensionsEvent",
7272
std::to_string(video_width),
7373
std::to_string(video_height)};
7474
CallbackStringArray(event);

0 commit comments

Comments
 (0)