projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move display_player_video into SimpleVideoView.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_stream.h
diff --git
a/src/lib/ffmpeg_stream.h
b/src/lib/ffmpeg_stream.h
index 6bbcd0b0131d441af5d469edf65031bdc5010d93..84b2a8853317082b676f651bee47f11de3bc940b 100644
(file)
--- a/
src/lib/ffmpeg_stream.h
+++ b/
src/lib/ffmpeg_stream.h
@@
-1,27
+1,28
@@
/*
Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
- 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.
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
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 <http://www.gnu.org/licenses/>.
*/
#ifndef DCPOMATIC_FFMPEG_STREAM_H
#define DCPOMATIC_FFMPEG_STREAM_H
*/
#ifndef DCPOMATIC_FFMPEG_STREAM_H
#define DCPOMATIC_FFMPEG_STREAM_H
-#include <boost/lexical_cast.hpp>
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
+#include <boost/lexical_cast.hpp>
struct AVFormatContext;
struct AVStream;
struct AVFormatContext;
struct AVStream;
@@
-33,8
+34,8
@@
public:
: name (n)
, _id (i)
{}
: name (n)
, _id (i)
{}
-
- FFmpegStream (cxml::ConstNodePtr);
+
+
explicit
FFmpegStream (cxml::ConstNodePtr);
void as_xml (xmlpp::Node *) const;
void as_xml (xmlpp::Node *) const;
@@
-53,11
+54,17
@@
public:
return boost::lexical_cast<std::string> (_id);
}
return boost::lexical_cast<std::string> (_id);
}
+ int id () const {
+ return _id;
+ }
+
+ int index (AVFormatContext const * c) const;
+
std::string name;
friend bool operator== (FFmpegStream const & a, FFmpegStream const & b);
friend bool operator!= (FFmpegStream const & a, FFmpegStream const & b);
std::string name;
friend bool operator== (FFmpegStream const & a, FFmpegStream const & b);
friend bool operator!= (FFmpegStream const & a, FFmpegStream const & b);
-
+
private:
int _id;
};
private:
int _id;
};