diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2006-11-15 10:05:33 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2006-11-15 10:05:33 +0000 |
| commit | 8795eafaa482ea25e34ed42fcdfa02b622111a01 (patch) | |
| tree | fec690a1b98a3a2cc8ea0a2daaf2bd7f5ff3cb94 | |
| parent | 12bfb95f3ffc8eaaee2eac9a80c6ceecbae0407c (diff) | |
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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sys/xvimage/xvimagesink.c | 3 | ||||
| -rw-r--r-- | tests/examples/seek/seek.c | 6 |
3 files changed, 13 insertions, 4 deletions
@@ -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: diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 84205f6e..aa6b3c7c 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -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; } diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c index f1242d9b..fb23ee53 100644 --- a/tests/examples/seek/seek.c +++ b/tests/examples/seek/seek.c @@ -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); |