[tracker: 37/37] Merge branch 'cuesheets'

[Martyn James Russell <mr src gnome org>]

commit ca8ec6cf9dfcf0e25b3227c8616effdc8696efff
Merge: 2569cf8 a1721ad
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Sep 30 16:00:41 2011 +0100

    Merge branch 'cuesheets'

 configure.ac                                       |   34 +
 data/ontologies/33-nfo.ontology                    |   11 +-
 .../libtracker-extract-sections.txt                |    1 +
 src/libtracker-common/tracker-file-utils.c         |   78 ++
 src/libtracker-common/tracker-file-utils.h         |   53 +-
 src/libtracker-common/tracker-utils.c              |    1 +
 src/libtracker-extract/tracker-extract-client.c    |   23 +-
 src/libtracker-extract/tracker-extract-info.c      |   24 +
 src/libtracker-extract/tracker-extract-info.h      |   31 +-
 src/libtracker-miner/tracker-miner-fs.c            |    6 +-
 src/libtracker-miner/tracker-sparql-buffer.c       |   28 +-
 src/libtracker-miner/tracker-sparql-buffer.h       |    3 +-
 src/miners/fs/tracker-miner-files.c                |   31 +-
 src/tracker-extract/Makefile.am                    |   11 +-
 src/tracker-extract/tracker-controller.c           |   30 +-
 src/tracker-extract/tracker-cue-sheet.c            |  423 ++++++++
 src/tracker-extract/tracker-cue-sheet.h            |   50 +
 src/tracker-extract/tracker-extract-gstreamer.c    | 1067 ++++++++++++--------
 src/tracker-extract/tracker-extract.c              |   20 +-
 .../functional-tests/301-miner-resource-removal.py |  332 ++++++
 tests/functional-tests/Makefile.am                 |    3 +-
 tests/functional-tests/common/utils/helpers.py     |    9 +-
 tests/libtracker-common/tracker-utils-test.c       |   31 +
 23 files changed, 1792 insertions(+), 508 deletions(-)
---