summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2003-07-03 17:57:45 +0000
committerBastien Nocera <hadess@src.gnome.org>2003-07-03 17:57:45 +0000
commit5497fe96bca36fa7f6b804215f719d1f92d06413 (patch)
tree394630e4ab4623339173b50530f416247492f88a
parentfe7727d2fcedc55e104bee300c3cf1d539dfc704 (diff)
downloadtotem-5497fe96bca36fa7f6b804215f719d1f92d06413.tar.gz
added Julien updated added a little echo to show which backend is used
2003-07-03 Bastien Nocera <hadess@hadess.net> * AUTHORS: added Julien * README: updated * configure.in: added a little echo to show which backend is used when configure finished * src/bacon-video-widget-xine.c: (bacon_video_widget_unrealize): xine_stop the stream before closing it, fixes the long time periods when closing the application while something was playing * src/totem-preferences.c: (totem_prefs_set_show_visuals): really set the visuals in the video widget on startup
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog12
-rw-r--r--README4
-rw-r--r--configure.in8
-rw-r--r--src/backend/bacon-video-widget-xine.c2
-rw-r--r--src/bacon-video-widget-xine.c2
-rw-r--r--src/totem-preferences.c13
7 files changed, 36 insertions, 6 deletions
diff --git a/AUTHORS b/AUTHORS
index 2dedafb49..a42ba4d8e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
Bastien Nocera <hadess@hadess.net>
+Julien Moutte <julien@moutte.net> (GStreamer backend)
diff --git a/ChangeLog b/ChangeLog
index ef5430d1a..02df9a219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-07-03 Bastien Nocera <hadess@hadess.net>
+
+ * AUTHORS: added Julien
+ * README: updated
+ * configure.in: added a little echo to show which backend is used
+ when configure finished
+ * src/bacon-video-widget-xine.c: (bacon_video_widget_unrealize):
+ xine_stop the stream before closing it, fixes the long time periods
+ when closing the application while something was playing
+ * src/totem-preferences.c: (totem_prefs_set_show_visuals): really
+ set the visuals in the video widget on startup
+
2003-07-02 Bastien Nocera <hadess@hadess.net>
* src/gtk-playlist.c: a real audio file starting with http:// will
diff --git a/README b/README
index 3c30b5daf..4593fecdb 100644
--- a/README
+++ b/README
@@ -295,6 +295,8 @@ http://article.gmane.org/gmane.comp.video.xine.devel/3456/match=+api+addition+su
- implement recursive loading for directories in the playlist only for local directories
- enhance the look of the controls popup in fullscreen
- fix the skip to spinner's range not getting updated (see update_mrl_label)
+- register all the icons with the stock stuff (see bluecurve for what icons
+we could be getting)
- rtsp plugin for xine?
http://www.live.com/liveMedia/#testProgs
@@ -307,7 +309,7 @@ From Iain:
GStreamer backend TODO
======================
-- brightness/contrast
+- brightness/contrast (See http://bugzilla.gnome.org/show_bug.cgi?id=115823)
- bacon_video_widget_get_current_frame
- audio cd playback, with cddb
- VCD playback
diff --git a/configure.in b/configure.in
index 88d13eb2b..75e55cc6b 100644
--- a/configure.in
+++ b/configure.in
@@ -250,3 +250,11 @@ src/Makefile
data/Makefile
po/Makefile.in
])
+
+echo
+if test x$ENABLE_GST = xno ; then
+ echo "Using the xine backend"
+else
+ echo "Using the GStreamer backend"
+fi
+echo
diff --git a/src/backend/bacon-video-widget-xine.c b/src/backend/bacon-video-widget-xine.c
index 2285766a8..da6f5c4c9 100644
--- a/src/backend/bacon-video-widget-xine.c
+++ b/src/backend/bacon-video-widget-xine.c
@@ -55,7 +55,6 @@
#define DEFAULT_HEIGHT 315
#define DEFAULT_WIDTH 420
#define CONFIG_FILE ".gnome2"G_DIR_SEPARATOR_S"totem_config"
-#define DEFAULT_TITLE _("Totem Video Window")
/* Signals */
enum {
@@ -1268,6 +1267,7 @@ bacon_video_widget_unrealize (GtkWidget *widget)
bvw = BACON_VIDEO_WIDGET (widget);
/* stop the playback */
+ xine_stop (bvw->priv->stream);
xine_close (bvw->priv->stream);
/* Kill the TV out */
diff --git a/src/bacon-video-widget-xine.c b/src/bacon-video-widget-xine.c
index 2285766a8..da6f5c4c9 100644
--- a/src/bacon-video-widget-xine.c
+++ b/src/bacon-video-widget-xine.c
@@ -55,7 +55,6 @@
#define DEFAULT_HEIGHT 315
#define DEFAULT_WIDTH 420
#define CONFIG_FILE ".gnome2"G_DIR_SEPARATOR_S"totem_config"
-#define DEFAULT_TITLE _("Totem Video Window")
/* Signals */
enum {
@@ -1268,6 +1267,7 @@ bacon_video_widget_unrealize (GtkWidget *widget)
bvw = BACON_VIDEO_WIDGET (widget);
/* stop the playback */
+ xine_stop (bvw->priv->stream);
xine_close (bvw->priv->stream);
/* Kill the TV out */
diff --git a/src/totem-preferences.c b/src/totem-preferences.c
index 298aa4ec8..c3fb93c7c 100644
--- a/src/totem-preferences.c
+++ b/src/totem-preferences.c
@@ -104,19 +104,26 @@ totem_prefs_set_show_visuals (Totem *totem, gboolean value, gboolean warn)
{
GtkWidget *item;
- gconf_client_set_bool (totem->gc, GCONF_PREFIX"/show_vfx", value, NULL);
+ gconf_client_set_bool (totem->gc,
+ GCONF_PREFIX"/show_vfx", value, NULL);
item = glade_xml_get_widget (totem->xml, "tpw_visuals_type_label");
gtk_widget_set_sensitive (item, value);
- item = glade_xml_get_widget (totem->xml, "tpw_visuals_type_optionmenu");
+ item = glade_xml_get_widget (totem->xml,
+ "tpw_visuals_type_optionmenu");
gtk_widget_set_sensitive (item, value);
item = glade_xml_get_widget (totem->xml, "tpw_visuals_size_label");
gtk_widget_set_sensitive (item, value);
- item = glade_xml_get_widget (totem->xml, "tpw_visuals_size_optionmenu");
+ item = glade_xml_get_widget (totem->xml,
+ "tpw_visuals_size_optionmenu");
gtk_widget_set_sensitive (item, value);
if (warn == FALSE)
+ {
+ bacon_video_widget_set_show_visuals
+ (BACON_VIDEO_WIDGET (totem->bvw), value);
return;
+ }
if (bacon_video_widget_set_show_visuals
(BACON_VIDEO_WIDGET (totem->bvw), value) == FALSE)