diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-21 11:41:50 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-21 11:41:50 +0000 |
| commit | 817620394821a4581ea8cfd02fb23f2524169405 (patch) | |
| tree | 9b4788f28c69253952de9f5ef6bf3cfa34fda34d /src/lib | |
| parent | fe886ca75591e3122e7123590dd09bedbc549199 (diff) | |
Remove FFmpegStream id accessor.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/content.h | 3 | ||||
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 6 | ||||
| -rw-r--r-- | src/lib/ffmpeg_content.h | 9 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/lib/content.h b/src/lib/content.h index 4ee7c267f..596a0a905 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -57,6 +57,9 @@ public: virtual void examine (boost::shared_ptr<Job>); virtual std::string summary () const = 0; + /** @return Technical details of this content; these are written to logs to + * help with debugging. + */ virtual std::string technical_summary () const; virtual std::string information () const = 0; virtual void as_xml (xmlpp::Node *) const; diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 34486d08b..5524efc65 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -207,12 +207,12 @@ FFmpegContent::technical_summary () const { string as = "none"; if (_audio_stream) { - as = String::compose ("id %1", _audio_stream->id ()); + as = _audio_stream->technical_summary (); } string ss = "none"; if (_subtitle_stream) { - ss = String::compose ("id %1", _subtitle_stream->id ()); + ss = _subtitle_stream->technical_summary (); } pair<string, string> filt = Filter::ffmpeg_strings (_filters); @@ -467,7 +467,7 @@ FFmpegContent::identifier () const boost::mutex::scoped_lock lm (_mutex); if (_subtitle_stream) { - s << "_" << _subtitle_stream->id (); + s << "_" << _subtitle_stream->identifier (); } for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) { diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index ed2169de0..6dbff41d1 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -51,9 +51,14 @@ public: bool uses_index (AVFormatContext const * c, int index) const; AVStream* stream (AVFormatContext const * c) const; - int id () const { - return _id; + std::string technical_summary () const { + return "id " + boost::lexical_cast<std::string> (_id); } + + std::string identifier () const { + return boost::lexical_cast<std::string> (_id); + } + std::string name; friend bool operator== (FFmpegStream const & a, FFmpegStream const & b); |