Remove somewhat pointless playlist description.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index a385625e7cdc2098b7c355868af96ed3e3f47a64..b8102d315f5619691423c9918cb0b93f1f7a2eb7 100644 (file)
--- 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 e2f9b101a4671d2e24276d2d03d7c593736dd16d..18255a15ed2e469980db49c1dbb640009d8bd711 100644 (file)
--- 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 6913874b905d19e8574a20a0e89a1a525e74c6c9..f1dd881b3a6764a5d62084eb6e0113931523a1ee 100644 (file)
--- 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 cea41ab3281729c84c185ed0e188d492f546218a..e6acff6944472db7e45827237914f1279c1c1a93 100644 (file)
--- 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 {

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index a4afb6d69f2c597c7738bd3977134c56317a2cbe..a9aa155af4b0f9da5374a53fd2179df2c0fbde66 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -384,13 +384,6 @@ FilmEditor::make_content_panel ()
        add_label_to_sizer (h, _content_panel, _("times"));
        _content_sizer->Add (h, 0, wxALL, 6);
 
-       _playlist_description = new wxStaticText (_content_panel, wxID_ANY, wxT ("\n \n \n \n "));
-       _content_sizer->Add (_playlist_description, 0.25, wxEXPAND | wxALL, 6);
-       wxFont font = _playlist_description->GetFont();
-       font.SetStyle(wxFONTSTYLE_ITALIC);
-       font.SetPointSize(font.GetPointSize() - 1);
-       _playlist_description->SetFont(font);
-
        _timeline_button = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
        _content_sizer->Add (_timeline_button, 0, wxALL, 6);
 
@@ -1211,8 +1204,6 @@ FilmEditor::setup_content ()
                /* Select the first item of content if non was selected before */
                _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
        }
-
-       setup_playlist_description ();
 }
 
 void
@@ -1445,17 +1436,6 @@ FilmEditor::setup_loop_sensitivity ()
        _loop_count->Enable (_loop_content->GetValue ());
 }
 
-void
-FilmEditor::setup_playlist_description ()
-{
-       if (!_film) {
-               _playlist_description->SetLabel (wxT (""));
-               return;
-       }
-
-       _playlist_description->SetLabel (std_to_wx (_film->playlist_description ()));
-}
-
 void
 FilmEditor::timeline_clicked (wxCommandEvent &)
 {

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 9e9cfb831fbdf229a8389f01290faa231a0b0eb8..685e7864f0fe3d012cf7baa0ea9164073dd55150 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -114,7 +114,6 @@ private:
        void setup_content_information ();
        void setup_content_button_sensitivity ();
        void setup_loop_sensitivity ();
-       void setup_playlist_description ();
        
        void active_jobs_changed (bool);
        boost::shared_ptr<Content> selected_content ();
@@ -148,7 +147,6 @@ private:
        wxCheckBox* _loop_content;
        wxSpinCtrl* _loop_count;
        wxButton* _timeline_button;
-       wxStaticText* _playlist_description;
        wxButton* _edit_dci_button;
        wxChoice* _format;
        wxStaticText* _format_description;