[totem] backend: Remove unused OSD popup



commit b5ef912a823f7e9ed890a6bc2d02065028c3ecbc
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Feb 4 14:58:48 2014 +0100

    backend: Remove unused OSD popup

 docs/reference/Makefile.am           |    3 -
 docs/reference/totem-sections.txt    |    1 -
 src/backend/Makefile.am              |    5 -
 src/backend/bacon-video-osd-actor.c  |  243 ----------
 src/backend/bacon-video-osd-actor.h  |   68 ---
 src/backend/bacon-video-widget.c     |   26 -
 src/backend/bacon-video-widget.h     |    2 -
 src/backend/gsd-osd-window-private.h |   68 ---
 src/backend/gsd-osd-window.c         |  838 ----------------------------------
 src/backend/gsd-osd-window.h         |   84 ----
 10 files changed, 0 insertions(+), 1338 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 2fad27f..a4e1cdf 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -102,12 +102,9 @@ IGNORE_HFILES = \
        totem-time-entry.h              \
        totem-tracker-widget.h          \
        gsd-media-keys-window.h         \
-       gsd-osd-window.h                \
-       bacon-video-osd-actor.h         \
        totem-search-entry.h            \
        gd-tagged-entry.h               \
        gd-fullscreen-filter.h          \
-       gsd-osd-window-private.h        \
        screenshot-filename-builder.h
 
 # Images to copy into HTML directory.
diff --git a/docs/reference/totem-sections.txt b/docs/reference/totem-sections.txt
index 44813c6..091f3c6 100644
--- a/docs/reference/totem-sections.txt
+++ b/docs/reference/totem-sections.txt
@@ -202,7 +202,6 @@ bacon_video_widget_is_playing
 bacon_video_widget_is_seekable
 bacon_video_widget_get_rate
 bacon_video_widget_set_rate
-bacon_video_widget_popup_osd
 bacon_video_widget_step
 <SUBSECTION Standard>
 BVW_TYPE_ASPECT_RATIO
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 1484922..1bbe313 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -49,11 +49,6 @@ libbaconvideowidget_la_SOURCES = \
        bacon-video-widget-gst-missing-plugins.h        \
        totem-aspect-frame.h                            \
        totem-aspect-frame.c                            \
-       gsd-osd-window.c                                \
-       gsd-osd-window.h                                \
-       gsd-osd-window-private.h                        \
-       bacon-video-osd-actor.c                         \
-       bacon-video-osd-actor.h                         \
        bacon-video-controls-actor.c                    \
        bacon-video-controls-actor.h                    \
        bacon-video-spinner-actor.h                     \
diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
index 9a92fd3..7f2edb8 100644
--- a/src/backend/bacon-video-widget.c
+++ b/src/backend/bacon-video-widget.c
@@ -86,7 +86,6 @@
 #include "totem-gst-pixbuf-helpers.h"
 #include "bacon-video-widget.h"
 #include "bacon-video-widget-gst-missing-plugins.h"
-#include "bacon-video-osd-actor.h"
 #include "bacon-video-controls-actor.h"
 #include "bacon-video-spinner-actor.h"
 #include "bacon-video-widget-enums.h"
@@ -94,8 +93,6 @@
 
 #define DEFAULT_USER_AGENT "Videos/"VERSION
 
-#define OSD_SIZE 130                           /* Size of the OSD popup */
-#define OSD_MARGIN 8                           /* Pixels from the top-left */
 #define CONTROLS_MARGIN 32.0                   /* Pixels from the bottom, left and right */
 #define DEFAULT_CONTROLS_WIDTH 600             /* In pixels */
 #define LOGO_SIZE 256                          /* Maximum size of the logo */
@@ -212,7 +209,6 @@ struct BaconVideoWidgetPrivate
   ClutterActor                *stage;
   ClutterActor                *texture;
   ClutterActor                *frame;
-  ClutterActor                *osd;
   ClutterActor                *controls;
   ClutterActor                *spinner;
 
@@ -3541,17 +3537,6 @@ bacon_video_widget_set_audio_output_type (BaconVideoWidget *bvw,
 }
 
 void
-bacon_video_widget_popup_osd (BaconVideoWidget *bvw,
-                             const char       *icon_name)
-{
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  bacon_video_osd_actor_set_icon_name (BACON_VIDEO_OSD_ACTOR (bvw->priv->osd),
-                                      icon_name);
-  bacon_video_osd_actor_show_and_fade (BACON_VIDEO_OSD_ACTOR (bvw->priv->osd));
-}
-
-void
 bacon_video_widget_show_popup (BaconVideoWidget *bvw)
 {
   g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
@@ -6227,17 +6212,6 @@ bacon_video_widget_initable_init (GInitable     *initable,
                                         bvw->priv->frame);
   clutter_actor_hide (bvw->priv->spinner);
 
-  /* The OSD */
-  bvw->priv->osd = bacon_video_osd_actor_new ();
-  clutter_actor_set_name (bvw->priv->osd, "osd");
-  clutter_actor_set_pivot_point (bvw->priv->osd, -OSD_MARGIN, -OSD_MARGIN); /* FIXME RTL */
-  clutter_actor_set_size (bvw->priv->osd, OSD_SIZE, OSD_SIZE);
-  clutter_actor_add_child (bvw->priv->stage, bvw->priv->osd);
-  clutter_actor_set_child_above_sibling (bvw->priv->stage,
-                                        bvw->priv->osd,
-                                        bvw->priv->frame);
-  bacon_video_osd_actor_hide (BACON_VIDEO_OSD_ACTOR (bvw->priv->osd));
-
   /* The controls */
   bvw->priv->controls = bacon_video_controls_actor_new ();
   clutter_actor_set_name (bvw->priv->controls, "controls");
diff --git a/src/backend/bacon-video-widget.h b/src/backend/bacon-video-widget.h
index c4679f8..92d7a8a 100644
--- a/src/backend/bacon-video-widget.h
+++ b/src/backend/bacon-video-widget.h
@@ -456,8 +456,6 @@ void bacon_video_widget_set_audio_output_type    (BaconVideoWidget *bvw,
 
 /* OSD */
 void bacon_video_widget_show_popup                (BaconVideoWidget *bvw);
-void bacon_video_widget_popup_osd                 (BaconVideoWidget *bvw,
-                                                  const char       *icon_name);
 
 GObject * bacon_video_widget_get_controls_object  (BaconVideoWidget *bvw);
 GObject * bacon_video_widget_get_header_object  (BaconVideoWidget *bvw);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]