diff options
author | Bastien Nocera <hadess@hadess.net> | 2008-06-18 10:46:11 +0000 |
---|---|---|
committer | Bastien Nocera <hadess@src.gnome.org> | 2008-06-18 10:46:11 +0000 |
commit | c208fe7a7e82192f8792d50c27b527f5e4030b50 (patch) | |
tree | 6244d0934fd642572552df48f6460acb3cc57478 | |
parent | 6f00ee6676c48a2fcd7147f7982d5fdd713c9b29 (diff) | |
download | totem-c208fe7a7e82192f8792d50c27b527f5e4030b50.tar.gz |
'+' and '-' on their own can now be used to go to the next/previous track,
2008-06-18 Bastien Nocera <hadess@hadess.net>
* README:
* src/totem.c (totem_action_open_files_list),
(totem_action_remote), (totem_action_handle_key_press):
'+' and '-' on their own can now be used to go to the next/previous
track, Force playback when using DVB, otherwise playback won't
autostart
* src/backend/bacon-video-widget-gst-0.10.c
(bacon_video_widget_get_metadata): Fix warning when fetching cover art
* src/backend/bacon-video-widget-xine.c (xine_event_message),
(bacon_video_widget_get_metadata): As above, and also try to give a
better error message when TV signal is lost
* src/totem-video-thumbnailer.c: Always have --g-fatal-warnings
enabled
svn path=/trunk/; revision=5474
-rw-r--r-- | ChangeLog | 19 | ||||
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | src/backend/bacon-video-widget-gst-0.10.c | 2 | ||||
-rw-r--r-- | src/backend/bacon-video-widget-xine.c | 8 | ||||
-rw-r--r-- | src/totem-video-thumbnailer.c | 2 | ||||
-rw-r--r-- | src/totem.c | 23 |
6 files changed, 41 insertions, 17 deletions
@@ -1,3 +1,22 @@ +2008-06-18 Bastien Nocera <hadess@hadess.net> + + * README: + * src/totem.c (totem_action_open_files_list), + (totem_action_remote), (totem_action_handle_key_press): + '+' and '-' on their own can now be used to go to the next/previous + track, Force playback when using DVB, otherwise playback won't + autostart + + * src/backend/bacon-video-widget-gst-0.10.c + (bacon_video_widget_get_metadata): Fix warning when fetching cover art + + * src/backend/bacon-video-widget-xine.c (xine_event_message), + (bacon_video_widget_get_metadata): As above, and also try to give a + better error message when TV signal is lost + + * src/totem-video-thumbnailer.c: Always have --g-fatal-warnings + enabled + 2008-06-16 Bastien Nocera <hadess@hadess.net> * src/backend/bacon-video-widget-xine.c @@ -68,9 +68,9 @@ Keypad Left / Keypad 4: DVD Action Left Keypad Right / Keypad 6: DVD Action Right -B, Alt+Left arrow: +B, Alt+Left arrow, Minus key: Previous stream (Back) -N, Alt+Right arrow: +N, Alt+Right arrow, Plus key: Next stream (Next) Ctrl+Q: Quit diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c index 5223b7db0..83f8daae2 100644 --- a/src/backend/bacon-video-widget-gst-0.10.c +++ b/src/backend/bacon-video-widget-gst-0.10.c @@ -4671,7 +4671,7 @@ bacon_video_widget_get_metadata (BaconVideoWidget * bvw, { const GValue *cover_value; - g_value_init (value, GDK_TYPE_PIXBUF); + g_value_init (value, G_TYPE_OBJECT); if (bvw->priv->tagcache == NULL) break; diff --git a/src/backend/bacon-video-widget-xine.c b/src/backend/bacon-video-widget-xine.c index 127118c2f..7cc8881f8 100644 --- a/src/backend/bacon-video-widget-xine.c +++ b/src/backend/bacon-video-widget-xine.c @@ -1340,7 +1340,11 @@ xine_event_message (BaconVideoWidget *bvw, xine_ui_message_data_t *data) case XINE_MSG_NO_ERROR: return; case XINE_MSG_GENERAL_WARNING: - return; + if (data->messages != NULL && strcmp (data->messages, "DVB Signal Lost. Please check connections.") == 0) { + num = BVW_ERROR_INVALID_DEVICE; + message = g_strdup (_("The TV adapter could not tune into the channel. Please check your hardware setup, and channel configuration.")); + } + break; case XINE_MSG_UNKNOWN_HOST: num = BVW_ERROR_UNKNOWN_HOST; message = g_strdup (_("The server you are trying to connect to is not known.")); @@ -4034,7 +4038,7 @@ bacon_video_widget_get_metadata (BaconVideoWidget *bvw, bacon_video_widget_get_metadata_bool (bvw, type, value); break; case BVW_INFO_COVER: - g_value_init (value, GDK_TYPE_PIXBUF); + g_value_init (value, G_TYPE_OBJECT); break; default: g_assert_not_reached (); diff --git a/src/totem-video-thumbnailer.c b/src/totem-video-thumbnailer.c index 5b3765fc5..6b073f0b0 100644 --- a/src/totem-video-thumbnailer.c +++ b/src/totem-video-thumbnailer.c @@ -464,9 +464,7 @@ static const GOptionEntry entries[] = { { "no-limit", 'l', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &time_limit, "Don't limit the thumbnailing time to 30 seconds", NULL }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Output debug information", NULL }, { "time", 't', 0, G_OPTION_ARG_INT64, &second_index, "Choose this time (in seconds) as the thumbnail", NULL }, -#ifndef THUMB_DEBUG {"g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &g_fatal_warnings, "Make all warnings fatal", NULL}, -#endif /* THUMB_DEBUG */ { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, "[FILE...]" }, { NULL } }; diff --git a/src/totem.c b/src/totem.c index 5b6f2423d..739d0af9a 100644 --- a/src/totem.c +++ b/src/totem.c @@ -1960,7 +1960,8 @@ totem_action_open_files_list (Totem *totem, GSList *list) totem_playlist_add_mrl (totem->playlist, data, NULL); changed = TRUE; } else if (g_str_equal (filename, "dvb:") != FALSE) { - changed = totem_action_load_media (totem, MEDIA_TYPE_DVB, NULL); + totem_action_play_media (totem, MEDIA_TYPE_DVB, "0"); + changed = TRUE; } else if (totem_playlist_add_mrl (totem->playlist, filename, NULL) != FALSE) { totem_action_add_recent (totem, filename); changed = TRUE; @@ -2185,7 +2186,7 @@ totem_action_remote (Totem *totem, TotemRemoteCommand cmd, const char *url) /* FIXME b0rked */ totem_action_play_media (totem, MEDIA_TYPE_VCD, NULL); } else if (g_str_has_prefix (url, "dvb:") != FALSE) { - totem_action_play_media (totem, MEDIA_TYPE_DVB, NULL); + totem_action_play_media (totem, MEDIA_TYPE_DVB, "0"); } else if (totem_playlist_add_mrl_with_cursor (totem->playlist, url, NULL) != FALSE) { totem_action_add_recent (totem, url); } @@ -2755,17 +2756,19 @@ totem_action_handle_key_press (Totem *totem, GdkEventKey *event) break; case GDK_plus: case GDK_KP_Add: - if (!(event->state & GDK_CONTROL_MASK)) - return FALSE; - - totem_action_zoom_relative (totem, ZOOM_IN_OFFSET); + if (!(event->state & GDK_CONTROL_MASK)) { + totem_action_next (totem); + } else { + totem_action_zoom_relative (totem, ZOOM_IN_OFFSET); + } break; case GDK_minus: case GDK_KP_Subtract: - if (!(event->state & GDK_CONTROL_MASK)) - return FALSE; - - totem_action_zoom_relative (totem, ZOOM_OUT_OFFSET); + if (!(event->state & GDK_CONTROL_MASK)) { + totem_action_previous (totem); + } else { + totem_action_zoom_relative (totem, ZOOM_OUT_OFFSET); + } break; case GDK_KP_Up: case GDK_KP_8: |