Menu
▾
▴
[gst-cvs] cael gst-player: gst-player/libs/gst/player/
|
From: arik d. <ca...@us...> - 2002-05-05 03:00:15
|
CVS Root: /cvsroot/gstreamer
Module: gst-player
Changes by: cael
Date: Sat May 04 2002 20:00:14 PDT
Log message:
some menu reorg.
Modified files:
libs/gst/player : gstcontrol.c gstcontrol.h gstmediaplay.c
Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/libs/gst/player/gstcontrol.c.diff?r1=1.8&r2=1.9
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/libs/gst/player/gstcontrol.h.diff?r1=1.2&r2=1.3
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/libs/gst/player/gstmediaplay.c.diff?r1=1.31&r2=1.32
====Begin Diffs====
Index: gstcontrol.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-player/libs/gst/player/gstcontrol.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gstcontrol.c 5 May 2002 02:42:33 -0000 1.8
+++ gstcontrol.c 5 May 2002 03:00:01 -0000 1.9
@@ -69,74 +69,80 @@
}
}
-static gint
-mini_mode (GnomeCanvasItem *item, GdkEvent *event, GstControl *control)
+static void
+set_mini_mode (GstControl *control)
{
GstControlPrivate *priv;
priv = control->_priv;
- switch (event->type)
+ if (GTK_WIDGET_VISIBLE (priv->button_prev) == TRUE)
{
- case GDK_BUTTON_PRESS:
- if (GTK_WIDGET_VISIBLE (priv->button_prev) == TRUE)
- {
- gtk_widget_hide (priv->button_prev);
- gtk_widget_hide (priv->button_stop);
- gtk_widget_hide (priv->button_next);
- gtk_widget_hide (priv->hscale_volume);
- gnome_canvas_item_hide (priv->canvas_seek);
- gnome_canvas_item_hide (priv->canvas_volume);
- gnome_canvas_item_show (priv->canvas_seek_small);
-
- gnome_canvas_item_set (priv->canvas_play,
- "x", 6.0,
- "y", 4.0,
- NULL);
+ gtk_widget_hide (priv->button_prev);
+ gtk_widget_hide (priv->button_stop);
+ gtk_widget_hide (priv->button_next);
+ gtk_widget_hide (priv->hscale_volume);
+ gnome_canvas_item_hide (priv->canvas_seek);
+ gnome_canvas_item_hide (priv->canvas_volume);
+ gnome_canvas_item_show (priv->canvas_seek_small);
- gnome_canvas_item_set (priv->canvas_seek_small,
- "x", 60.0,
- "y", 5.0,
- NULL);
-
- gnome_canvas_item_set (priv->button_mini,
- "x", 300.0,
- "y", 3.0,
- NULL);
+ gnome_canvas_item_set (priv->canvas_play,
+ "x", 6.0,
+ "y", 4.0,
+ NULL);
- gtk_widget_set_usize (priv->canvas, 320, 26);
-
- g_signal_emit (control, gst_control_signals [MINI_MODE], 0);
- }
- else
- {
- gtk_widget_show (priv->button_prev);
- gtk_widget_show (priv->button_stop);
- gtk_widget_show (priv->button_next);
- gtk_widget_show (priv->hscale_volume);
- gnome_canvas_item_show (priv->canvas_seek);
- gnome_canvas_item_show (priv->canvas_volume);
- gnome_canvas_item_hide (priv->canvas_seek_small);
-
- gnome_canvas_item_set (priv->canvas_play,
- "x", 81.0,
- "y", 36.0,
- NULL);
-
- gnome_canvas_item_set (priv->canvas_seek_small,
- "x", 60.0,
- "y", 13.0,
- NULL);
-
- gnome_canvas_item_set (priv->button_mini,
- "x", 300.0,
- "y", 12.0,
- NULL);
-
- gtk_widget_set_usize (priv->canvas, 320, 61);
+ gnome_canvas_item_set (priv->canvas_seek_small,
+ "x", 60.0,
+ "y", 5.0,
+ NULL);
+
+ gnome_canvas_item_set (priv->button_mini,
+ "x", 300.0,
+ "y", 3.0,
+ NULL);
+
+ gtk_widget_set_usize (priv->canvas, 320, 26);
+
+ g_signal_emit (control, gst_control_signals [MINI_MODE], 0);
+ }
+ else
+ {
+ gtk_widget_show (priv->button_prev);
+ gtk_widget_show (priv->button_stop);
+ gtk_widget_show (priv->button_next);
+ gtk_widget_show (priv->hscale_volume);
+ gnome_canvas_item_show (priv->canvas_seek);
+ gnome_canvas_item_show (priv->canvas_volume);
+ gnome_canvas_item_hide (priv->canvas_seek_small);
+
+ gnome_canvas_item_set (priv->canvas_play,
+ "x", 81.0,
+ "y", 36.0,
+ NULL);
+
+ gnome_canvas_item_set (priv->canvas_seek_small,
+ "x", 60.0,
+ "y", 13.0,
+ NULL);
+
+ gnome_canvas_item_set (priv->button_mini,
+ "x", 300.0,
+ "y", 12.0,
+ NULL);
+
+ gtk_widget_set_usize (priv->canvas, 320, 61);
+
+ g_signal_emit (control, gst_control_signals [MINI_MODE], 0);
+ }
+}
- g_signal_emit (control, gst_control_signals [MINI_MODE], 0);
- }
+static gint
+mini_mode (GnomeCanvasItem *item, GdkEvent *event, GstControl *control)
+{
+ switch (event->type)
+ {
+ case GDK_BUTTON_PRESS:
+ set_mini_mode (control);
break;
default:
break;
@@ -423,4 +429,10 @@
control = g_object_new (GST_TYPE_CONTROL, NULL);
return GTK_WIDGET (control);
+}
+
+void
+gst_control_set_mini_mode (GstControl *control)
+{
+ set_mini_mode (control);
}
Index: gstcontrol.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-player/libs/gst/player/gstcontrol.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gstcontrol.h 5 May 2002 01:57:55 -0000 1.2
+++ gstcontrol.h 5 May 2002 03:00:01 -0000 1.3
@@ -35,8 +35,10 @@
void (*volume_change) (GstControl *control);
};
-GtkType gst_control_get_type (void);
-GtkWidget* gst_control_new (void);
+GtkType gst_control_get_type (void);
+GtkWidget* gst_control_new (void);
+
+void gst_control_set_mini_mode (GstControl *control);
G_END_DECLS
Index: gstmediaplay.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-player/libs/gst/player/gstmediaplay.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- gstmediaplay.c 5 May 2002 01:57:55 -0000 1.31
+++ gstmediaplay.c 5 May 2002 03:00:01 -0000 1.32
@@ -27,6 +27,7 @@
void gst_media_play_set_volume (GtkWidget *widget, gdouble value, GstMediaPlay *mplay);
static void gst_media_play_mini_mode (GtkWidget *widget, GstMediaPlay *mplay);
+static void gst_media_play_set_mini_mode (GtkWidget *widget, GstMediaPlay *mplay);
static void gst_media_play_half_size (GtkWidget *widget, GstMediaPlay *mplay);
static void gst_media_play_full_size (GtkWidget *widget, GstMediaPlay *mplay);
static void gst_media_play_double_size (GtkWidget *widget, GstMediaPlay *mplay);
@@ -39,13 +40,27 @@
static GnomeUIInfo file_menu [] =
{
GNOMEUIINFO_MENU_OPEN_ITEM (cb_open, NULL),
+ {
+ GNOME_APP_UI_ITEM, N_("_Media Info"),
+ NULL,
+ gst_media_play_show_media_info, NULL, NULL,
+ GNOME_APP_PIXMAP_NONE, NULL,
+ GDK_i, (GdkModifierType) GDK_CONTROL_MASK, NULL
+ },
GNOMEUIINFO_MENU_EXIT_ITEM (cb_destroy, NULL),
GNOMEUIINFO_END
};
-static GnomeUIInfo present_movie_menu_uiinfo[] =
+static GnomeUIInfo view_menu [] =
{
{
+ GNOME_APP_UI_ITEM, N_("Mini Mode"),
+ NULL,
+ gst_media_play_set_mini_mode, NULL, NULL,
+ GNOME_APP_PIXMAP_NONE, NULL,
+ GDK_T, (GdkModifierType) GDK_CONTROL_MASK, NULL
+ },
+ {
GNOME_APP_UI_ITEM, N_("_Half Size"),
NULL,
gst_media_play_half_size, NULL, NULL,
@@ -76,25 +91,6 @@
GNOMEUIINFO_END
};
-static GnomeUIInfo view_menu [] =
-{
- {
- GNOME_APP_UI_SUBTREE, N_("P_resent Movie"),
- NULL,
- present_movie_menu_uiinfo, NULL, NULL,
- GNOME_APP_PIXMAP_NONE, NULL,
- 0, (GdkModifierType) 0, NULL
- },
- {
- GNOME_APP_UI_ITEM, N_("_Media Info"),
- NULL,
- gst_media_play_show_media_info, NULL, NULL,
- GNOME_APP_PIXMAP_NONE, NULL,
- GDK_i, (GdkModifierType) GDK_CONTROL_MASK, NULL
- },
- GNOMEUIINFO_END
-};
-
static GnomeUIInfo settings_menu [] =
{
GNOMEUIINFO_MENU_PREFERENCES_ITEM (gst_media_play_show_preferences, NULL),
@@ -405,6 +401,12 @@
{
gtk_widget_show (GNOME_APP (mplay->window)->menubar);
}
+}
+
+static void
+gst_media_play_set_mini_mode (GtkWidget *widget, GstMediaPlay *mplay)
+{
+ gst_control_set_mini_mode (GST_CONTROL (mplay->control));
}
static void
|