X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=d9bee97c6b910a55683b5bfde474a362f8396a1c;hb=20467713a9efeaf4e32d4e9c644af8afb507da65;hp=33bad1d24455fc03938f175cd3f1bf3be7c06b1c;hpb=6f344b876689a1234a5eb75041882f06f5d9fe5c;p=dcpomatic.git diff --git a/src/lib/types.h b/src/lib/types.h index 33bad1d24..d9bee97c6 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic 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 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic 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, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -48,8 +49,6 @@ namespace xmlpp { #define SERVER_LINK_VERSION (64+0) typedef std::vector > ContentList; -typedef std::vector > AudioContentList; -typedef std::vector > SubtitleContentList; typedef std::vector > FFmpegContentList; typedef int64_t Frame;