sys/xvimage/xvimagesink.c: clear xv when going to NULL, remove // commented non-existant proto

Original commit message from CVS:
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_change_state):
clear xv when going to NULL, remove // commented non-existant proto
* tests/examples/seek/seek.c: (main):
add missing tooltip description for scrub and play_scrub
This commit is contained in:
Stefan Kost 2006-11-15 10:05:33 +00:00
parent 12bfb95f3f
commit 8795eafaa4
3 changed files with 13 additions and 4 deletions

View file

@ -1,3 +1,11 @@
2006-11-09 Stefan Kost <ensonic@users.sf.net>
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_change_state):
clear xv when going to NULL, remove // commented non-existant proto
* tests/examples/seek/seek.c: (main):
add missing tooltip description for scrub and play_scrub
2006-11-14 David Schleef <ds@schleef.org>
* configure.ac:

View file

@ -156,8 +156,6 @@ static gint gst_xvimagesink_get_format_from_caps (GstXvImageSink * xvimagesink,
GstCaps * caps);
static void gst_xvimagesink_expose (GstXOverlay * overlay);
//static void gst_xvimagesink_send_pending_navigation (GstXvImageSink * xvimagesink);
/* ElementFactory information */
static const GstElementDetails gst_xvimagesink_details =
GST_ELEMENT_DETAILS ("Video sink",
@ -1972,6 +1970,7 @@ gst_xvimagesink_change_state (GstElement * element, GstStateChange transition)
gst_xvimagesink_imagepool_clear (xvimagesink);
if (xvimagesink->xwindow) {
gst_xvimagesink_xwindow_clear (xvimagesink, xvimagesink->xwindow);
gst_xvimagesink_xwindow_destroy (xvimagesink, xvimagesink->xwindow);
xvimagesink->xwindow = NULL;
}

View file

@ -1507,8 +1507,10 @@ main (int argc, char **argv)
gtk_tooltips_set_tip (tips, rate_spinbutton, "define the playback rate, "
"negative value trigger reverse playback", NULL);
/* FIXME: describe these */
gtk_tooltips_set_tip (tips, scrub_checkbox, "???", NULL);
gtk_tooltips_set_tip (tips, play_scrub_checkbox, "???", NULL);
gtk_tooltips_set_tip (tips, scrub_checkbox, "show images while seeking",
NULL);
gtk_tooltips_set_tip (tips, play_scrub_checkbox, "play video while seeking",
NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (flush_checkbox), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scrub_checkbox), TRUE);