← Back to branch summary

~ubuntu-branches/ubuntu/lucid/totem/lucid

« back to all changes in this revision

Viewing changes to src/totem-object.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-12-02 21:56:06 UTC
  • mfrom: (1.11.1 upstream) (2.2.11 sid)
  • Revision ID: james.westby@ubuntu.com-20091202215606-6uum8ai032ebaa9p
Tags: 2.28.4-0ubuntu1
* New upstream version:
  Movie Player:
  - Don't hide the fullscreen popups when the mouse is on top of them
  Thumbnailer:
  - Fix covers not being used any more
  Web browser plugin:
  - Fix potential crasher when using Javascript bindings
  - Fix resolution of absolute URL
* Sync on Debian
* debian/control.in:
  - build-depends on liblaunchpad-integration-dev
  - set vcs url
  - add XB-Npp-Description and XB-Npp-Filename header to the 
    totem-mozilla package to improve ubufox/ubuntu plugin db integration 
  - change refences from Iceweasel to Firefox
  - don't build using libepc, galago those are in universe
  - split totem-plugins package in an extra package for the components 
    which have depends in universe
  - use suggests rather than recommends for universe gstreamer components
* debian/patches/02_lpi.patch,
  debian/patches/90_autotools.patch: 
  - launchpad integration change
* debian/patches/07_disable_web_browser_midi.patch:
  - Disable MIDI support in totem web browser plugin as Karmic's gstreamer
    doesn't support streaming MIDI files over HTTP (LP 463102)
* debian/patches/70_bbc_plugin.patch: 
  - removed Debian APT changes. Made strings translatable.
* debian/rules:
  - don't build complex
* debian/source_totem.py, debian/totem-common.install:
  - use an apport hook to get details on the issue and try to use the right 
    component especially for codec and sound issues
* debian/totem-common.gconf-defaults: 
  - Activate content retrieval plugins (BBC and YouTube) by default      
* debian/totem-plugins-extra.install:
  - install things which have depends in universe in an extra binary

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/totem-object.c
1712
1712
                if (subtitle == NULL && totem->autoload_subs != FALSE)
1713
1713
                        autoload_sub = totem_uri_get_subtitle_uri (mrl);
1714
1714
 
 
1715
                /* HACK: Bad bad Apple */
 
1716
                if (g_str_has_prefix (mrl, "http://movies.apple.com") != FALSE)
 
1717
                        bacon_video_widget_set_user_agent (totem->bvw, "Quicktime/7.2.0");
 
1718
                else
 
1719
                        bacon_video_widget_set_user_agent (totem->bvw, NULL);
 
1720
 
1715
1721
                totem_gdk_window_set_waiting_cursor (totem->win->window);
1716
1722
                totem_try_restore_position (totem, mrl);
1717
1723
                retval = bacon_video_widget_open (totem->bvw, mrl, subtitle ? subtitle : autoload_sub, &err);
2427
2433
        /* Clear the seek if it's there, we only want to try and seek
2428
2434
         * the first file, even if it's not there */
2429
2435
        totem->seek_to = 0;
 
2436
        totem->seek_to_start = 0;
2430
2437
 
2431
2438
        if (playback_stopped)
2432
2439
                play_pause_set_label (totem, STATE_STOPPED);
2477
2484
        gtk_action_set_sensitive (action, seekable);
2478
2485
 
2479
2486
        /* This is for the session restore to seek */
2480
 
        if (seekable != FALSE && totem->seek_to != 0) {
2481
 
                bacon_video_widget_seek_time (totem->bvw,
2482
 
                                totem->seek_to, NULL);
2483
 
                totem_action_pause (totem);
 
2487
        if (seekable != FALSE) {
 
2488
                if (totem->seek_to != 0) {
 
2489
                        bacon_video_widget_seek_time (totem->bvw,
 
2490
                                                      totem->seek_to, NULL);
 
2491
                }
 
2492
                if (totem->seek_to_start != 0) {
 
2493
                        bacon_video_widget_seek_time (totem->bvw,
 
2494
                                                      totem->seek_to, NULL);
 
2495
                        totem_action_pause (totem);
 
2496
                }
2484
2497
        }
2485
2498
        totem->seek_to = 0;
 
2499
        totem->seek_to_start = 0;
2486
2500
 
2487
2501
        g_object_notify (G_OBJECT (totem), "seekable");
2488
2502
}
3328
3342
                return FALSE;
3329
3343
        }
3330
3344
 
3331
 
        if (totem_playlist_has_next_mrl (totem->playlist) == FALSE
3332
 
                        && totem_playlist_get_repeat (totem->playlist) == FALSE)
3333
 
        {
 
3345
        if (totem_playlist_has_next_mrl (totem->playlist) == FALSE &&
 
3346
            totem_playlist_get_repeat (totem->playlist) == FALSE &&
 
3347
            (totem_playlist_get_last (totem->playlist) != 0 ||
 
3348
             totem_is_seekable (totem) == FALSE)) {
3334
3349
                char *mrl, *subtitle;
3335
3350
 
3336
3351
                /* Set play button status */
3343
3358
                g_free (mrl);
3344
3359
                g_free (subtitle);
3345
3360
        } else {
3346
 
                if (totem_playlist_get_repeat (totem->playlist)
3347
 
                                && totem_playlist_get_last  (totem->playlist) == 0
3348
 
                                && totem_is_seekable (totem))
3349
 
                        totem_action_seek_time (totem, 0);
3350
 
                else
 
3361
                if (totem_playlist_get_last (totem->playlist) == 0 &&
 
3362
                    totem_is_seekable (totem)) {
 
3363
                        if (totem_playlist_get_repeat (totem->playlist) != FALSE) {
 
3364
                                totem_action_seek_time (totem, 0);
 
3365
                                totem_action_play (totem);
 
3366
                        } else {
 
3367
                                totem_action_pause (totem);
 
3368
                                totem_action_seek_time (totem, 0);
 
3369
                        }
 
3370
                } else {
3351
3371
                        totem_action_next (totem);
 
3372
                }
3352
3373
        }
3353
3374
 
3354
3375
        return FALSE;