Menu
▾
▴
[gst-cvs] dolphy gst-player: gst-player/ gst-player/libs/gst/player/ gst-player/src/ gst-player/ui/
|
From: Julien M. <do...@us...> - 2003-07-11 21:29:54
|
CVS Root: /cvsroot/gstreamer
Module: gst-player
Changes by: dolphy
Date: Fri Jul 11 2003 14:29:53 PDT
Log message:
Adding effectv menu
Modified files:
. : ChangeLog
libs/gst/player : gstmediaplay.c gstmediaplay.h
src : main.c
ui : gst-player.glade
Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/ChangeLog.diff?r1=1.28&r2=1.29
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/libs/gst/player/gstmediaplay.c.diff?r1=1.124&r2=1.125
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/libs/gst/player/gstmediaplay.h.diff?r1=1.44&r2=1.45
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/src/main.c.diff?r1=1.51&r2=1.52
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-player/ui/gst-player.glade.diff?r1=1.5&r2=1.6
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gstreamer/gst-player/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog 11 Jul 2003 20:27:39 -0000 1.28
+++ ChangeLog 11 Jul 2003 21:29:39 -0000 1.29
@@ -1,3 +1,27 @@
+2003-07-11 Julien MOUTTE <ju...@mo...>
+
+ * libs/gst/player/gstmediaplay.c: (gst_media_play_set_effect):
+ * libs/gst/player/gstmediaplay.h: Adding set_effect handler
+ * src/main.c: (on_play_pause_activate), (on_error),
+ (create_full_path), (add_to_recent), (current_location),
+ (on_open_activate), (on_open_location_activate),
+ (on_open_audio_cd_activate), (on_open_webcam_activate),
+ (on_quit_activate), (on_properties_activate),
+ (on_preferences_activate), (on_fullscreen_activate),
+ (on_fullscreen_toggled), (on_scale_to_1_2_activate),
+ (on_scale_to_1_1_activate), (on_scale_to_2_1_activate),
+ (on_best_fit_window_activate), (on_toggle_visualization_activate),
+ (on_show_hide_playlist_activate), (on_next_media_activate),
+ (on_previous_media_activate), (on_volume_up_activate),
+ (on_volume_down_activate), (on_mute_volume_activate),
+ (on_about_activate), (on_visual_toggled), (on_effect_toggled),
+ (cb_configure), (cb_fullscreen), (handle_keypress),
+ (gst_player_connect_func), (on_recent_file_activate),
+ (setup_recent), (get_plugins_list_from_class),
+ (setup_visuals_list), (setup_effects_list), (main): Fixing indentation
+ and implementing effect menu
+ * ui/gst-player.glade: Addind effect menu.
+
2003-07-02 David Schleef <ds...@sc...>
* mozilla/plugin.c: Fixed prototype to conform to Mozilla-1.4.
Did they change the ABI? Yes they did.
Index: gstmediaplay.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-player/libs/gst/player/gstmediaplay.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- gstmediaplay.c 16 Jun 2003 10:34:36 -0000 1.124
+++ gstmediaplay.c 11 Jul 2003 21:29:40 -0000 1.125
@@ -1427,6 +1427,55 @@
}
}
+gboolean
+gst_media_play_set_effect (GstMediaPlay * mplay, const char *name)
+{
+ gboolean paused = FALSE;
+ GString *videosink_desc;
+ GstElement *videosink_bin, *vis_videosink_bin;
+ g_return_if_fail (GST_IS_MEDIA_PLAY (mplay));
+
+ videosink_desc = g_string_sized_new (128);
+
+ if (gst_play_get_state (mplay->_priv->play) == GST_STATE_PLAYING)
+ {
+ gst_play_set_state (mplay->_priv->play, GST_STATE_PAUSED);
+ paused = TRUE;
+ }
+
+ videosink_desc = g_string_append (videosink_desc,
+ gst_gconf_get_string ("default/videosink"));
+
+ videosink_desc = g_string_prepend (videosink_desc, " ! colorspace ! ");
+ videosink_desc = g_string_prepend (videosink_desc, name);
+
+ videosink_bin = gst_gconf_render_bin_from_description (videosink_desc->str);
+ vis_videosink_bin = gst_gconf_render_bin_from_description (videosink_desc->str);
+
+ g_string_free (videosink_desc, TRUE);
+
+ if (GST_IS_ELEMENT (videosink_bin))
+ {
+ gst_play_set_video_sink (mplay->_priv->play,
+ videosink_bin);
+ gst_play_set_visualisation_video_sink (mplay->_priv->play,
+ vis_videosink_bin);
+ if (paused)
+ {
+ gst_play_seek_to_time (mplay->_priv->play,
+ mplay->_priv->current_time_nanos);
+ gst_play_set_state (mplay->_priv->play, GST_STATE_PLAYING);
+ }
+
+ return FALSE;
+ }
+ else
+ {
+ g_message ("Failed loading effect plugin %s", name);
+ return FALSE;
+ }
+}
+
void
gst_media_play_set_state (GstMediaPlay * mplay, GstElementState state)
{
Index: gstmediaplay.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-player/libs/gst/player/gstmediaplay.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- gstmediaplay.h 16 Jun 2003 10:34:36 -0000 1.44
+++ gstmediaplay.h 11 Jul 2003 21:29:40 -0000 1.45
@@ -105,6 +105,8 @@
GstElement *gst_media_play_get_visual (GstMediaPlay * mplay);
gboolean gst_media_play_set_visual (GstMediaPlay * mplay, const char *name);
+gboolean gst_media_play_set_effect (GstMediaPlay * mplay, const char *name);
+
void gst_media_play_set_state (GstMediaPlay * mplay, GstElementState state);
GstElementState gst_media_play_get_state (GstMediaPlay * mplay);
Index: main.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-player/src/main.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- main.c 2 Jul 2003 18:07:57 -0000 1.51
+++ main.c 11 Jul 2003 21:29:40 -0000 1.52
@@ -21,8 +21,8 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
-
- #include <locale.h>
+
+#include <locale.h>
#include <config.h>
#include <gnome.h>
#include <glade/glade.h>
@@ -36,26 +36,25 @@
[...1493 lines suppressed...]
+ i++;
}
+ gst_media_play_set_location (player->mplay,
+ gtk_playlist_get_current_mrl (GTK_PLAYLIST
+ (player->
+ mplay->
+ playlist)));
- gtk_main ();
- return 0;
+ /* check if we should play on startup */
+ if (!gst_media_gconf_get_boolean ("play-on-startup", &play_on_startup))
+ play_on_startup = FALSE;
+ if (play_on_startup)
+ on_play_pause_activate (player->win, player);
+ }
+
+ gtk_main ();
+ return 0;
}
Index: gst-player.glade
===================================================================
RCS file: /cvsroot/gstreamer/gst-player/ui/gst-player.glade,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gst-player.glade 24 May 2003 21:32:23 -0000 1.5
+++ gst-player.glade 11 Jul 2003 21:29:40 -0000 1.6
@@ -51,7 +51,7 @@
<accelerator key="l" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image325">
+ <widget class="GtkImage" id="image450">
<property name="visible">True</property>
<property name="stock">gtk-convert</property>
<property name="icon_size">1</property>
@@ -74,7 +74,7 @@
<accelerator key="a" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image326">
+ <widget class="GtkImage" id="image451">
<property name="visible">True</property>
<property name="stock">gtk-cdrom</property>
<property name="icon_size">1</property>
@@ -147,7 +147,7 @@
<signal name="activate" handler="on_preferences_activate" last_modification_time="Thu, 22 May 2003 11:25:06 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image327">
+ <widget class="GtkImage" id="image452">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -181,7 +181,7 @@
<accelerator key="f" modifiers="0" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image328">
+ <widget class="GtkImage" id="image453">
<property name="visible">True</property>
<property name="pixbuf">maximize.png</property>
<property name="xalign">0.5</property>
@@ -202,7 +202,7 @@
<accelerator key="0" modifiers="0" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image329">
+ <widget class="GtkImage" id="image454">
<property name="visible">True</property>
<property name="stock">gtk-zoom-out</property>
<property name="icon_size">1</property>
@@ -224,7 +224,7 @@
<accelerator key="1" modifiers="0" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image330">
+ <widget class="GtkImage" id="image455">
<property name="visible">True</property>
<property name="stock">gtk-zoom-100</property>
<property name="icon_size">1</property>
@@ -246,7 +246,7 @@
<accelerator key="2" modifiers="0" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image331">
+ <widget class="GtkImage" id="image456">
<property name="visible">True</property>
<property name="stock">gtk-zoom-in</property>
<property name="icon_size">1</property>
@@ -267,7 +267,7 @@
<signal name="activate" handler="on_best_fit_window_activate" last_modification_time="Wed, 21 May 2003 10:44:45 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image332">
+ <widget class="GtkImage" id="image457">
<property name="visible">True</property>
<property name="stock">gtk-zoom-fit</property>
<property name="icon_size">1</property>
@@ -287,13 +287,54 @@
</child>
<child>
+ <widget class="GtkImageMenuItem" id="effects_menu">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Effects</property>
+ <property name="use_underline">True</property>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image458">
+ <property name="visible">True</property>
+ <property name="stock">gtk-select-color</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenu" id="effects_menu_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="toggle_effects_menu_item">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Toggle _Effects</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_toggle_effects_activate" last_modification_time="Thu, 10 Jul 2003 19:02:48 GMT"/>
+ <accelerator key="e" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="effects_separator">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkImageMenuItem" id="visualization_menu">
<property name="visible">True</property>
<property name="label" translatable="yes">_Visualization</property>
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image333">
+ <widget class="GtkImage" id="image459">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
<property name="icon_size">1</property>
@@ -335,7 +376,7 @@
<signal name="activate" handler="on_show_hide_playlist_activate" last_modification_time="Wed, 21 May 2003 10:51:02 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image334">
+ <widget class="GtkImage" id="image460">
<property name="visible">True</property>
<property name="stock">gnome-stock-text-bulleted-list</property>
<property name="icon_size">1</property>
@@ -370,7 +411,7 @@
<accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image335">
+ <widget class="GtkImage" id="image461">
<property name="visible">True</property>
<property name="stock">gtk-go-forward</property>
<property name="icon_size">1</property>
@@ -425,7 +466,7 @@
<accelerator key="Up" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image336">
+ <widget class="GtkImage" id="image462">
<property name="visible">True</property>
<property name="pixbuf">volume-max.png</property>
<property name="xalign">0.5</property>
@@ -446,7 +487,7 @@
<accelerator key="Down" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image337">
+ <widget class="GtkImage" id="image463">
<property name="visible">True</property>
<property name="pixbuf">volume-min.png</property>
<property name="xalign">0.5</property>
@@ -467,7 +508,7 @@
<accelerator key="m" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image338">
+ <widget class="GtkImage" id="image464">
<property name="visible">True</property>
<property name="pixbuf">volume_mute.png</property>
<property name="xalign">0.5</property>
|