summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-06 14:57:20 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-06 14:57:20 +0100
commit9bf304a86a3df6f4b10a572d657b5d7beb910582 (patch)
tree1af3dc6c036fb6c287041adc58249cef00263f0e /src/lib
parent74040395aa25ade07f62f97d8a199b919b7487a2 (diff)
Remove somewhat pointless playlist description.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/film.cc6
-rw-r--r--src/lib/film.h2
-rw-r--r--src/lib/playlist.cc48
-rw-r--r--src/lib/playlist.h2
4 files changed, 0 insertions, 58 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index a385625e7..b8102d315 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1167,12 +1167,6 @@ Film::has_subtitles () const
return _playlist->has_subtitles ();
}
-string
-Film::playlist_description () const
-{
- return _playlist->description ();
-}
-
void
Film::set_audio_mapping (AudioMapping m)
{
diff --git a/src/lib/film.h b/src/lib/film.h
index e2f9b101a..18255a15e 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -122,8 +122,6 @@ public:
ContentVideoFrame content_length () const;
- std::string playlist_description () const;
-
void set_loop (int);
int loop () const;
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 6913874b9..f1dd881b3 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -430,51 +430,3 @@ Playlist::has_subtitles () const
return !fc->subtitle_streams().empty();
}
-
-string
-Playlist::description () const
-{
- stringstream s;
-
- if (_video.empty ()) {
- s << _("There is no video.") << "\n";
- } else {
- s << _("Video will come from ");
- list<shared_ptr<const VideoContent> >::const_iterator i = _video.begin();
- while (i != _video.end ()) {
- s << (*i)->file().filename().string();
- ++i;
- if (i != _video.end ()) {
- s << ", ";
- }
- }
- if (_video.size() > 1) {
- s << " " << _("in sequence.");
- }
- s << "\n";
- }
-
- if (_audio.empty ()) {
- s << _("There is no audio.") << "\n";
- } else {
- if (_audio_from == AUDIO_FFMPEG) {
- s << _("Audio will come from the video files.") << "\n";
- } else {
- s << _("Audio will come from ");
- list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin();
- while (i != _audio.end ()) {
- s << (*i)->file().filename().string();
- ++i;
- if (i != _audio.end ()) {
- s << ", ";
- }
- }
- if (_audio.size() > 1) {
- s << _(" run simultaneously.");
- }
- s << "\n";
- }
- }
-
- return s.str ();
-}
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index cea41ab32..e6acff694 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -88,8 +88,6 @@ public:
return _content;
}
- std::string description () const;
-
boost::shared_ptr<FFmpegContent> ffmpeg () const;
std::list<boost::shared_ptr<const VideoContent> > video () const {