[gnac: 98/98] Merge branch 'devel'
- From: BenoÃt Dupasquier <bdupasqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnac: 98/98] Merge branch 'devel'
- Date: Thu, 26 Jan 2012 00:29:51 +0000 (UTC)
commit e5dcfd378fe133865ddc143a398d957bc21cdabf
Merge: 4106904 74fd92c
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date: Thu Jan 26 00:28:46 2012 +0000
Merge branch 'devel'
Makefile.am | 3 +-
NEWS | 6 +-
configure.ac | 29 +-
data/gnac.desktop.in.in | 1 -
data/profiles/aac.xml.in | 12 +-
data/profiles/base.xml.in | 6 +-
data/profiles/flac.xml.in | 11 +-
data/profiles/mp3-lame.xml.in | 27 +-
data/profiles/speex.xml.in | 48 +-
data/profiles/ui/gnac-profiles-aac.xml | 28 +-
data/profiles/ui/gnac-profiles-base-advanced.xml | 14 +-
data/profiles/ui/gnac-profiles-combo.xml | 28 +-
data/profiles/ui/gnac-profiles-flac.xml | 17 +-
data/profiles/ui/gnac-profiles-lame.xml | 64 +-
data/profiles/ui/gnac-profiles-manager.xml | 198 +++-
data/profiles/ui/gnac-profiles-properties.xml | 205 ++--
data/profiles/ui/gnac-profiles-speex.xml | 69 +-
data/profiles/ui/gnac-profiles-unknown.xml | 9 +-
data/profiles/ui/gnac-profiles-vorbis.xml | 45 +-
data/profiles/ui/gnac-profiles-wav.xml | 8 +-
data/profiles/ui/gnac-profiles-wavpack.xml | 42 +-
data/profiles/vorbis.xml.in | 15 +-
data/profiles/wavpack.xml.in | 21 +-
data/ui/gnac-pref-window.xml | 192 ++--
data/ui/gnac-properties-window.xml | 133 ++-
data/ui/gnac.xml | 91 +-
debian/changelog | 6 +-
debian/control | 4 +-
debian/copyright | 9 +-
debian/rules | 6 +-
help/.gitignore | 1 +
libgnac/Makefile.am | 4 +-
libgnac/libgnac-converter.c | 827 +++++---------
libgnac/libgnac-converter.h | 20 +-
libgnac/libgnac-debug.c | 57 +-
libgnac/libgnac-debug.h | 2 +-
libgnac/libgnac-error.c | 102 ++-
libgnac/libgnac-error.h | 12 +-
libgnac/libgnac-gst-utils.c | 60 +-
libgnac/libgnac-gst-utils.h | 2 +-
libgnac/libgnac-gst.c | 339 ++----
libgnac/libgnac-gst.h | 2 +-
libgnac/libgnac-marshallers.c | 2 +-
libgnac/libgnac-marshallers.h | 2 +-
libgnac/libgnac-media-item.c | 109 +--
libgnac/libgnac-media-item.h | 5 +-
libgnac/libgnac-metadata-tags.h | 2 +-
libgnac/libgnac-metadata.c | 464 +++-----
libgnac/libgnac-metadata.h | 2 +-
libgnac/libgnac-output.c | 343 +++---
libgnac/libgnac-output.h | 17 +-
libgnac/libgnac-profile.h | 2 +-
man/gnac.1 | 2 +-
po/POTFILES.in | 9 +-
src/Makefile.am | 10 +-
src/gnac-bars.c | 146 +--
src/gnac-bars.h | 16 +-
src/gnac-file-list.c | 599 +++-------
src/gnac-file-list.h | 21 +-
src/gnac-main.c | 667 ++++-------
src/gnac-main.h | 47 +-
src/gnac-options.c | 11 +-
src/gnac-options.h | 5 +-
src/gnac-playlist.c | 150 ++--
src/gnac-playlist.h | 12 +-
src/gnac-prefs.c | 552 ++++-----
src/gnac-prefs.h | 10 +-
src/gnac-properties.c | 682 ++++++------
src/gnac-properties.h | 27 +-
src/gnac-settings.c | 140 +++
src/gnac-settings.h | 92 ++
src/gnac-stock-items.c | 16 +-
src/gnac-stock-items.h | 2 +-
src/gnac-ui-utils.c | 247 ++++
src/gnac-ui-utils.h | 102 ++
src/gnac-ui.c | 832 +++++--------
src/gnac-ui.h | 77 +-
src/gnac-utils.c | 197 ++--
src/gnac-utils.h | 40 +-
src/profiles/formats/gnac-profiles-aac.c | 233 ++--
src/profiles/formats/gnac-profiles-aac.h | 49 +-
src/profiles/formats/gnac-profiles-flac.c | 195 ++--
src/profiles/formats/gnac-profiles-flac.h | 46 +-
src/profiles/formats/gnac-profiles-lame.c | 693 ++++++------
src/profiles/formats/gnac-profiles-lame.h | 55 +-
src/profiles/formats/gnac-profiles-speex.c | 713 ++++++------
src/profiles/formats/gnac-profiles-speex.h | 53 +-
src/profiles/formats/gnac-profiles-unknown.c | 254 ++---
src/profiles/formats/gnac-profiles-unknown.h | 43 +-
src/profiles/formats/gnac-profiles-vorbis.c | 414 ++++----
src/profiles/formats/gnac-profiles-vorbis.h | 49 +-
src/profiles/formats/gnac-profiles-wav.c | 118 +-
src/profiles/formats/gnac-profiles-wav.h | 39 +-
src/profiles/formats/gnac-profiles-wavpack.c | 558 +++++-----
src/profiles/formats/gnac-profiles-wavpack.h | 51 +-
src/profiles/gnac-profiles-default.c | 253 ++---
src/profiles/gnac-profiles-default.h | 57 +-
src/profiles/gnac-profiles-manager.c | 1379 ++++++++++------------
src/profiles/gnac-profiles-manager.h | 29 +-
src/profiles/gnac-profiles-properties.c | 1006 ++++++----------
src/profiles/gnac-profiles-properties.h | 20 +-
src/profiles/gnac-profiles-utils.c | 1190 +++++++------------
src/profiles/gnac-profiles-utils.h | 181 +---
src/profiles/gnac-profiles-xml-engine.c | 801 +++++++------
src/profiles/gnac-profiles-xml-engine.h | 55 +-
src/profiles/gnac-profiles.c | 300 ++----
src/profiles/gnac-profiles.h | 13 +-
107 files changed, 7787 insertions(+), 9494 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
