[banshee/gapless-ng: 819/836] Merge remote branch 'gitorious/master' into gapless-ng

[Christopher James Halse Rogers <chrishr src gnome org>]

commit cb9ac7cc5e445aff27c5e578add2762ae261ab24
Merge: 14f0409 b0087e9
Author: Christopher James Halse Rogers <raof ubuntu com>
Date:   Fri Feb 5 11:18:07 2010 +1100

    Merge remote branch 'gitorious/master' into gapless-ng

 libbanshee/banshee-player-pipeline.c               |  107 ++++++++++++++++----
 libbanshee/banshee-player-private.h                |   14 +++
 libbanshee/banshee-player-video.c                  |   16 ++--
 libbanshee/banshee-player.c                        |   40 +++++++
 .../Banshee.GStreamer/PlayerEngine.cs              |  104 +++++++++++++++++++
 .../Banshee.MediaEngine/PlayerEngine.cs            |   50 +++++++++
 .../Banshee.MediaEngine/PlayerEngineService.cs     |   85 ++++++++++++----
 .../Banshee.MediaEngine/PlayerEvent.cs             |    3 +-
 .../IBasicPlaybackController.cs                    |    2 +-
 .../PlaybackControllerService.cs                   |   84 +++++++++-------
 .../Banshee.InternetRadio/InternetRadioSource.cs   |   14 +++-
 .../Banshee.Lastfm.Radio/StationSource.cs          |   21 +++--
 .../Banshee.PlayQueue/PlayQueueSource.cs           |   15 ++-
 13 files changed, 460 insertions(+), 95 deletions(-)
---
diff --cc src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
index b608722,6350405..24be7fd
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
@@@ -138,11 -143,11 +146,13 @@@ namespace Banshee.GStreame
              vis_data_callback = new BansheePlayerVisDataCallback (OnVisualizationData);
              video_pipeline_setup_callback = new VideoPipelineSetupHandler (OnVideoPipelineSetup);
              tag_found_callback = new GstTaggerTagFoundCallback (OnTagFound);
+             next_track_starting_callback = new BansheePlayerNextTrackStartingCallback (OnNextTrackStarting);
+             about_to_finish_callback = new BansheePlayerAboutToFinishCallback (OnAboutToFinish);
  
              bp_set_eos_callback (handle, eos_callback);
 +#if !WIN32
              bp_set_iterate_callback (handle, iterate_callback);
 +#endif
              bp_set_error_callback (handle, error_callback);
              bp_set_state_changed_callback (handle, state_changed_callback);
              bp_set_buffering_callback (handle, buffering_callback);