No-op; fix GPL address and use the explicit-program-name version.

[dcpomatic.git] / src / wx / timeline_video_content_view.cc

diff --git a/src/wx/timeline_video_content_view.cc b/src/wx/timeline_video_content_view.cc
index 6d37c68a61ecea788a85786716cfbee8485f6564..731108c93ac7e890414c838b41c48174c00caeef 100644 (file)
--- a/src/wx/timeline_video_content_view.cc
+++ b/src/wx/timeline_video_content_view.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 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.
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -29,16 +30,6 @@ TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr<Con
 
 }
 
-wxString
-TimelineVideoContentView::type () const
-{
-       if (dynamic_pointer_cast<ImageContent> (content ()) && content()->number_of_paths() == 1) {
-               return _("still");
-       } else {
-               return _("video");
-       }
-}
-
 wxColour
 TimelineVideoContentView::background_colour () const
 {