@@ -231,7 +231,7 @@ video_map_cb (GtkWidget *widget, ClapperAppWindow *self)
231
231
232
232
GST_TRACE_OBJECT (self , "Video map" );
233
233
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 ));
235
235
236
236
g_signal_connect (player , "notify::volume" ,
237
237
G_CALLBACK (_player_volume_changed_cb ), self );
@@ -252,7 +252,7 @@ video_unmap_cb (GtkWidget *widget, ClapperAppWindow *self)
252
252
253
253
GST_TRACE_OBJECT (self , "Video unmap" );
254
254
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 ));
256
256
257
257
g_signal_handlers_disconnect_by_func (player , _player_volume_changed_cb , self );
258
258
g_signal_handlers_disconnect_by_func (player , _player_speed_changed_cb , self );
@@ -524,7 +524,7 @@ drag_update_cb (GtkGestureDrag *drag,
524
524
static inline void
525
525
_alter_volume (ClapperAppWindow * self , gdouble dy )
526
526
{
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 ));
528
528
gdouble volume = clapper_player_get_volume (player );
529
529
530
530
/* We do not want for volume to change too suddenly */
@@ -547,7 +547,7 @@ _alter_volume (ClapperAppWindow *self, gdouble dy)
547
547
static inline void
548
548
_alter_speed (ClapperAppWindow * self , gdouble dx )
549
549
{
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 ));
551
551
gdouble speed = clapper_player_get_speed (player );
552
552
553
553
speed -= dx * 0.02 ;
@@ -571,8 +571,7 @@ _begin_seek_operation (ClapperAppWindow *self)
571
571
if (self -> seeking )
572
572
return FALSE;
573
573
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 ));
576
575
queue = clapper_player_get_queue (player );
577
576
current_item = clapper_queue_get_current_item (queue );
578
577
@@ -600,8 +599,8 @@ static void
600
599
_end_seek_operation (ClapperAppWindow * self )
601
600
{
602
601
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 ));
605
604
606
605
clapper_player_seek_custom (player , self -> pending_position ,
607
606
g_settings_get_int (self -> settings , "seek-method" ));
@@ -764,8 +763,8 @@ _handle_seek_key_press (ClapperAppWindow *self, gboolean forward)
764
763
static void
765
764
_handle_chapter_key_press (ClapperAppWindow * self , gboolean forward )
766
765
{
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 ));
769
768
ClapperQueue * queue = clapper_player_get_queue (player );
770
769
ClapperMediaItem * current_item = clapper_queue_get_current_item (queue );
771
770
ClapperTimeline * timeline ;
@@ -855,8 +854,8 @@ _handle_chapter_key_press (ClapperAppWindow *self, gboolean forward)
855
854
static void
856
855
_handle_item_key_press (ClapperAppWindow * self , gboolean forward )
857
856
{
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 ));
860
859
ClapperQueue * queue = clapper_player_get_queue (player );
861
860
guint prev_index , index ;
862
861
@@ -887,8 +886,8 @@ _handle_speed_key_press (ClapperAppWindow *self, gboolean forward)
887
886
static inline void
888
887
_handle_progression_key_press (ClapperAppWindow * self )
889
888
{
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 ));
892
891
ClapperQueue * queue = clapper_player_get_queue (player );
893
892
ClapperQueueProgressionMode mode ;
894
893
const gchar * icon = NULL , * label = NULL ;
@@ -1123,7 +1122,7 @@ clapper_app_window_get_video (ClapperAppWindow *self)
1123
1122
ClapperPlayer *
1124
1123
clapper_app_window_get_player (ClapperAppWindow * self )
1125
1124
{
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 ));
1127
1126
}
1128
1127
1129
1128
ClapperAppWindowExtraOptions *
0 commit comments