[rhythmbox: 16/17] Merge branch 'media-player-sync'

[Jonathan Matthew <jmatthew src gnome org>]

commit fdefa0500154974130253d9fa72f27782893c231
Merge: ae52ba7 5c2c381
Author: Jonathan Matthew <jonathan d14n org>
Date:   Mon Mar 29 21:37:13 2010 +1000

    Merge branch 'media-player-sync'

 data/ui/media-player-properties.ui                |  157 ++++
 plugins/generic-player/generic-player-ui.xml      |    6 +-
 plugins/generic-player/rb-generic-player-source.c |  111 +++
 plugins/ipod/ipod-ui.xml                          |    2 +
 plugins/ipod/rb-ipod-db.c                         |   11 +-
 plugins/ipod/rb-ipod-db.h                         |    1 +
 plugins/ipod/rb-ipod-plugin.c                     |    2 +
 plugins/ipod/rb-ipod-source.c                     |  212 ++++-
 plugins/ipod/rb-ipod-source.h                     |    9 +-
 plugins/ipod/rb-ipod-static-playlist-source.c     |    8 +-
 plugins/mtpdevice/mtp-ui.xml                      |    1 +
 plugins/mtpdevice/rb-mtp-plugin.c                 |    1 +
 plugins/mtpdevice/rb-mtp-source.c                 |  175 +++-
 sources/Makefile.am                               |    2 +
 sources/rb-media-player-source.c                  | 1002 +++++++++++++++++++++
 sources/rb-media-player-source.h                  |   22 +
 sources/rb-media-player-sync-settings.c           |  426 +++++++++
 sources/rb-media-player-sync-settings.h           |   99 ++
 18 files changed, 2178 insertions(+), 69 deletions(-)
---