Commit 32f418a3 authored by Bart van der Velden's avatar Bart van der Velden

- Removed TagLibAmalgam

- Updated copyright notices and e-mail address
parent c60735a4
......@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright 2012, Bart van der Velden <bart@mbvelden.net>
# Copyright 2012-2013, Bart van der Velden <bart@muckingabout.eu>
# All rights reserved.
#
# ***** END GPL LICENSE BLOCK *****
......
......@@ -6,5 +6,5 @@ doc/license/gpl-3.0.txt
Apart from the GNU GPL, MusicCollection is not available under other licenses.
2012, Bart van der Velden
bart@mbvelden.net
Copyright 2012-2013, Bart van der Velden
bart@muckingabout.eu
......@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright 2012, Bart van der Velden <bart@mbvelden.net>
# Copyright 2012-2013, Bart van der Velden <bart@muckingabout.eu>
# All rights reserved.
#
# ***** END GPL LICENSE BLOCK *****
......@@ -21,7 +21,7 @@
# This code is largely based on the CMakeList.txt file of the Blender
# project. Thanks guys!
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8)
project(MusicCollection)
# The version number
......@@ -112,8 +112,6 @@ include_directories("${PROJECT_SOURCE_DIR}/utils")
add_subdirectory(utils)
set (EXTRA_LIBS ${EXTRA_LIBS} utils)
#include_directories("${PROJECT_SOURCE_DIR}/TagLibAmalgam")
#add_subdirectory(TagLibAmalgam)
set (EXTRA_LIBS ${EXTRA_LIBS} ${TAGLIB_LIBRARIES})
set (EXTRA_LIBS ${EXTRA_LIBS} ${Boost_LIBRARIES})
......
/*****************************************************************************
* Copyright 2012 Bart van der Velden <bart@mbvelden.net> *
* Copyright 2012-2013 Bart van der Velden <bart@muckingabout.eu> *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
......
Scott Wheeler <wheeler@kde.org>
Author, maintainer
Lukas Lalinsky <lalinsky@gmail.com>
Implementation of multiple new file formats, many bug fixes, maintainer
Ismael Orenstein <orenstein@kde.org>
Xing header implementation
Allan Sandfeld Jensen <kde@carewolf.org>
FLAC metadata implementation
Teemu Tervo <teemu.tervo@gmx.net>
Numerous bug reports and fixes
Mathias Panzenböck <grosser.meister.morti@gmx.net>
Mod, S3M, IT and XM metadata implementations
Please send all patches and questions to taglib-devel@kde.org rather than to
individual developers!
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright 2012, Bart van der Velden <bart@mbvelden.net>
# All rights reserved.
#
# ***** END GPL LICENSE BLOCK *****
add_library(TagLibAmalgam
TagLibAmalgam.cpp TagLibAmalgam.h
)
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
TagLib is dual licensed, under either the Mozilla Public License, or the
Lesser Gnu General Public License. For details see the corresponding license
files COPYING.MPL and COPYING.LGPL.
# TagLib Amalgamation
A distribution of the [TagLib][1] library in amalgamated source code form.
## What's an amalgamation?
An amalgamation is simply a collection of header and source files that have been
concatenated together to form one or more very large files. In this form, they
are easy to add to your existing project as source files (rather than linking
as a library). They are also easier to redistribute if you are making an open
source application and don't want to have any external dependencies.
## What is TagLib?
TagLib is a library for reading and editing the meta-data of several popular
audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg
Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack
TrueAudio, WAV, AIFF, MP4 and ASF files.
## How do I use this?
Add TagLibAmalgam.cpp to your existing project, include TagLibAmalgam.h
in the source files where you want to use TagLib, and that's it!
The [TagLib Amalgamation][2] was built using the [Amalgamate Templates][3].
## License
Copyright (c) 2002 Scott Wheeler, Lukas Lalinsky, Ismael Orenstein,
Allan Sandfeld Jensen, Teemu Tervo, Mathias Panzenböck<br>
TagLib is distributed under both the [GNU Lesser General Public License][4]
(LGPL) and the [Mozilla Public License][5] (MPL).
[1]: http://developer.kde.org/~wheeler/taglib.html "TagLib"
[2]: https://github.com/vinniefalco/TagLibAmalgam/ "TagLib Amalgamation"
[3]: https://github.com/vinniefalco/Amalgams/ "Amalgamate Templates"
[4]: http://www.gnu.org/licenses/gpl-2.0.html "GNU GPL v2"
[5]: http://www.mozilla.org/MPL/ "MPL"
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment