Remove extra unnecessary type string in timeline views.

8 files changed, 1 insertions, 27 deletions

diff --git a/src/wx/timeline_audio_content_view.cc b/src/wx/timeline_audio_content_view.cc
index a9e3a6a42..325830e85 100644
--- a/src/wx/timeline_audio_content_view.cc
+++ b/src/wx/timeline_audio_content_view.cc
@@ -31,12 +31,6 @@ TimelineAudioContentView::TimelineAudioContentView (Timeline& tl, shared_ptr<Con
 
 }
 
-wxString
-TimelineAudioContentView::type () const
-{
-	return _("audio");
-}
-
 wxColour
 TimelineAudioContentView::background_colour () const
 {
diff --git a/src/wx/timeline_audio_content_view.h b/src/wx/timeline_audio_content_view.h
index 6f1a383de..3d034eed4 100644
--- a/src/wx/timeline_audio_content_view.h
+++ b/src/wx/timeline_audio_content_view.h
@@ -28,7 +28,6 @@ public:
 	TimelineAudioContentView (Timeline& tl, boost::shared_ptr<Content> c);
 
 private:
-	wxString type () const;
 	wxColour background_colour () const;
 	wxColour foreground_colour () const;
 };
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 324790f87..858214c33 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -121,7 +121,7 @@ TimelineContentView::do_paint (wxGraphicsContext* gc)
 	gc->StrokePath (path);
 	gc->FillPath (path);
 
-	wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->summary()).data(), type().data());
+	wxString name = std_to_wx (cont->summary());
 	wxDouble name_width;
 	wxDouble name_height;
 	wxDouble name_descent;
diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 3262f13f3..676e4792b 100644
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -43,7 +43,6 @@ public:
 	void unset_track ();
 	boost::optional<int> track () const;
 
-	virtual wxString type () const = 0;
 	virtual wxColour background_colour () const = 0;
 	virtual wxColour foreground_colour () const = 0;
 
diff --git a/src/wx/timeline_subtitle_content_view.cc b/src/wx/timeline_subtitle_content_view.cc
index 3d1766391..559fc7f4d 100644
--- a/src/wx/timeline_subtitle_content_view.cc
+++ b/src/wx/timeline_subtitle_content_view.cc
@@ -29,12 +29,6 @@ TimelineSubtitleContentView::TimelineSubtitleContentView (Timeline& tl, shared_p
 
 }
 
-wxString
-TimelineSubtitleContentView::type () const
-{
-	return _("subtitles");
-}
-
 wxColour
 TimelineSubtitleContentView::background_colour () const
 {
diff --git a/src/wx/timeline_subtitle_content_view.h b/src/wx/timeline_subtitle_content_view.h
index b2ba96c70..42ba432f3 100644
--- a/src/wx/timeline_subtitle_content_view.h
+++ b/src/wx/timeline_subtitle_content_view.h
@@ -30,7 +30,6 @@ public:
 	TimelineSubtitleContentView (Timeline& tl, boost::shared_ptr<SubtitleContent> c);
 
 private:
-	wxString type () const;
 	wxColour background_colour () const;
 	wxColour foreground_colour () const;
 
diff --git a/src/wx/timeline_video_content_view.cc b/src/wx/timeline_video_content_view.cc
index 6d37c68a6..a54b91de0 100644
--- a/src/wx/timeline_video_content_view.cc
+++ b/src/wx/timeline_video_content_view.cc
@@ -29,16 +29,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
 {
diff --git a/src/wx/timeline_video_content_view.h b/src/wx/timeline_video_content_view.h
index 3dd76140a..795c23006 100644
--- a/src/wx/timeline_video_content_view.h
+++ b/src/wx/timeline_video_content_view.h
@@ -28,7 +28,6 @@ public:
 	TimelineVideoContentView (Timeline& tl, boost::shared_ptr<Content> c);
 
 private:
-	wxString type () const;
 	wxColour background_colour () const;
 	wxColour foreground_colour () const;
 };