[tracker: 8/8] Merge branch 'extractor-controller-thread'

[Martyn James Russell <mr src gnome org>]

commit 9318125a2e249144f7396d3630625da038f000d9
Merge: dff0e6f 0114fbf
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Apr 13 10:45:26 2011 +0100

    Merge branch 'extractor-controller-thread'

 src/libtracker-common/tracker-os-dependant-unix.c |   25 +-
 src/tracker-extract/Makefile.am                   |    2 +
 src/tracker-extract/tracker-controller.c          |  894 +++++++++++++++++++++
 src/tracker-extract/tracker-controller.h          |   57 ++
 src/tracker-extract/tracker-extract-mp3.c         |    6 +
 src/tracker-extract/tracker-extract.c             |  579 +++-----------
 src/tracker-extract/tracker-extract.h             |   18 +-
 src/tracker-extract/tracker-main.c                |   86 +-
 8 files changed, 1163 insertions(+), 504 deletions(-)
---