Skip to content

Commit ddfeddd

Browse files
committed
clapper-app: Use player from AV widget
Replace all usage of "clapper_gtk_video_get_player" with "clapper_gtk_av_get_player" as the former one is deprecated
1 parent 7430970 commit ddfeddd

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

src/bin/clapper-app/clapper-app-window.c

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ video_map_cb (GtkWidget *widget, ClapperAppWindow *self)
231231

232232
GST_TRACE_OBJECT (self, "Video map");
233233

234-
player = clapper_gtk_video_get_player (CLAPPER_GTK_VIDEO_CAST (self->video));
234+
player = clapper_gtk_av_get_player (CLAPPER_GTK_AV_CAST (self->video));
235235

236236
g_signal_connect (player, "notify::volume",
237237
G_CALLBACK (_player_volume_changed_cb), self);
@@ -252,7 +252,7 @@ video_unmap_cb (GtkWidget *widget, ClapperAppWindow *self)
252252

253253
GST_TRACE_OBJECT (self, "Video unmap");
254254

255-
player = clapper_gtk_video_get_player (CLAPPER_GTK_VIDEO_CAST (self->video));
255+
player = clapper_gtk_av_get_player (CLAPPER_GTK_AV_CAST (self->video));
256256

257257
g_signal_handlers_disconnect_by_func (player, _player_volume_changed_cb, self);
258258
g_signal_handlers_disconnect_by_func (player, _player_speed_changed_cb, self);
@@ -524,7 +524,7 @@ drag_update_cb (GtkGestureDrag *drag,
524524
static inline void
525525
_alter_volume (ClapperAppWindow *self, gdouble dy)
526526
{
527-
ClapperPlayer *player = clapper_gtk_video_get_player (CLAPPER_GTK_VIDEO_CAST (self->video));
527+
ClapperPlayer *player = clapper_gtk_av_get_player (CLAPPER_GTK_AV_CAST (self->video));
528528
gdouble volume = clapper_player_get_volume (player);
529529

530530
/* We do not want for volume to change too suddenly */
@@ -547,7 +547,7 @@ _alter_volume (ClapperAppWindow *self, gdouble dy)
547547
static inline void
548548
_alter_speed (ClapperAppWindow *self, gdouble dx)
549549
{
550-
ClapperPlayer *player = clapper_gtk_video_get_player (CLAPPER_GTK_VIDEO_CAST (self->video));
550+
ClapperPlayer *player = clapper_gtk_av_get_player (CLAPPER_GTK_AV_CAST (self->video));
551551
gdouble speed = clapper_player_get_speed (player);
552552

553553
speed -= dx * 0.02;
@@ -571,8 +571,7 @@ _begin_seek_operation (ClapperAppWindow *self)
571571
if (self->seeking)
572572
return FALSE;
573573

574-
player = clapper_gtk_video_get_player (
575-
CLAPPER_GTK_VIDEO_CAST (self->video));
574+
player = clapper_gtk_av_get_player (CLAPPER_GTK_AV_CAST (self->video));
576575
queue = clapper_player_get_queue (player);
577576
current_item = clapper_queue_get_current_item (queue);
578577

@@ -600,8 +599,8 @@ static void
600599
_end_seek_operation (ClapperAppWindow *self)
601600
{
602601
if (self->seeking && self->current_duration > 0) {
603-
ClapperPlayer *player = clapper_gtk_video_get_player (
604-
CLAPPER_GTK_VIDEO_CAST (self->video));
602+
ClapperPlayer *player = clapper_gtk_av_get_player (
603+
CLAPPER_GTK_AV_CAST (self->video));
605604

606605
clapper_player_seek_custom (player, self->pending_position,
607606
g_settings_get_int (self->settings, "seek-method"));
@@ -764,8 +763,8 @@ _handle_seek_key_press (ClapperAppWindow *self, gboolean forward)
764763
static void
765764
_handle_chapter_key_press (ClapperAppWindow *self, gboolean forward)
766765
{
767-
ClapperPlayer *player = clapper_gtk_video_get_player (
768-
CLAPPER_GTK_VIDEO_CAST (self->video));
766+
ClapperPlayer *player = clapper_gtk_av_get_player (
767+
CLAPPER_GTK_AV_CAST (self->video));
769768
ClapperQueue *queue = clapper_player_get_queue (player);
770769
ClapperMediaItem *current_item = clapper_queue_get_current_item (queue);
771770
ClapperTimeline *timeline;
@@ -855,8 +854,8 @@ _handle_chapter_key_press (ClapperAppWindow *self, gboolean forward)
855854
static void
856855
_handle_item_key_press (ClapperAppWindow *self, gboolean forward)
857856
{
858-
ClapperPlayer *player = clapper_gtk_video_get_player (
859-
CLAPPER_GTK_VIDEO_CAST (self->video));
857+
ClapperPlayer *player = clapper_gtk_av_get_player (
858+
CLAPPER_GTK_AV_CAST (self->video));
860859
ClapperQueue *queue = clapper_player_get_queue (player);
861860
guint prev_index, index;
862861

@@ -887,8 +886,8 @@ _handle_speed_key_press (ClapperAppWindow *self, gboolean forward)
887886
static inline void
888887
_handle_progression_key_press (ClapperAppWindow *self)
889888
{
890-
ClapperPlayer *player = clapper_gtk_video_get_player (
891-
CLAPPER_GTK_VIDEO_CAST (self->video));
889+
ClapperPlayer *player = clapper_gtk_av_get_player (
890+
CLAPPER_GTK_AV_CAST (self->video));
892891
ClapperQueue *queue = clapper_player_get_queue (player);
893892
ClapperQueueProgressionMode mode;
894893
const gchar *icon = NULL, *label = NULL;
@@ -1123,7 +1122,7 @@ clapper_app_window_get_video (ClapperAppWindow *self)
11231122
ClapperPlayer *
11241123
clapper_app_window_get_player (ClapperAppWindow *self)
11251124
{
1126-
return clapper_gtk_video_get_player (CLAPPER_GTK_VIDEO_CAST (self->video));
1125+
return clapper_gtk_av_get_player (CLAPPER_GTK_AV_CAST (self->video));
11271126
}
11281127

11291128
ClapperAppWindowExtraOptions *

0 commit comments

Comments
 (0)