diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/content.h | 1 | ||||
| -rw-r--r-- | src/lib/dcp_subtitle_content.cc | 6 | ||||
| -rw-r--r-- | src/lib/dcp_subtitle_content.h | 1 | ||||
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 15 | ||||
| -rw-r--r-- | src/lib/ffmpeg_content.h | 1 | ||||
| -rw-r--r-- | src/lib/sndfile_content.cc | 19 | ||||
| -rw-r--r-- | src/lib/subrip_content.cc | 6 | ||||
| -rw-r--r-- | src/lib/subrip_content.h | 1 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 24 | ||||
| -rw-r--r-- | src/lib/video_content.h | 1 |
10 files changed, 0 insertions, 75 deletions
diff --git a/src/lib/content.h b/src/lib/content.h index e383f9ff0..a3e6da988 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -80,7 +80,6 @@ public: */ virtual std::string technical_summary () const; - virtual std::string information () const = 0; virtual void as_xml (xmlpp::Node *) const; virtual DCPTime full_length () const = 0; virtual std::string identifier () const; diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index 351d8c26e..e814946f4 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -84,12 +84,6 @@ DCPSubtitleContent::technical_summary () const return Content::technical_summary() + " - " + _("DCP XML subtitles"); } -string -DCPSubtitleContent::information () const -{ - -} - void DCPSubtitleContent::as_xml (xmlpp::Node* node) const { diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h index 551dafd15..e1a0b6490 100644 --- a/src/lib/dcp_subtitle_content.h +++ b/src/lib/dcp_subtitle_content.h @@ -29,7 +29,6 @@ public: void examine (boost::shared_ptr<Job>, bool calculate_digest); std::string summary () const; std::string technical_summary () const; - std::string information () const; void as_xml (xmlpp::Node *) const; DCPTime full_length () const; diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 740efdc29..66f78d541 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -228,21 +228,6 @@ FFmpegContent::technical_summary () const ); } -string -FFmpegContent::information () const -{ - if (video_length() == ContentTime (0) || video_frame_rate() == 0) { - return ""; - } - - SafeStringStream s; - - s << String::compose (_("%1 frames; %2 frames per second"), video_length_after_3d_combine().frames (video_frame_rate()), video_frame_rate()) << "\n"; - s << VideoContent::information (); - - return s.str (); -} - void FFmpegContent::set_subtitle_stream (shared_ptr<FFmpegSubtitleStream> s) { diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index 8203b7ac1..2831c2acf 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -59,7 +59,6 @@ public: void examine (boost::shared_ptr<Job>, bool calculate_digest); std::string summary () const; std::string technical_summary () const; - std::string information () const; void as_xml (xmlpp::Node *) const; DCPTime full_length () const; diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc index 3c377d644..e0b7cc10c 100644 --- a/src/lib/sndfile_content.cc +++ b/src/lib/sndfile_content.cc @@ -72,25 +72,6 @@ SndfileContent::technical_summary () const + " - sndfile"; } -string -SndfileContent::information () const -{ - if (_audio_frame_rate == 0) { - return ""; - } - - SafeStringStream s; - - s << String::compose ( - _("%1 channels, %2kHz, %3 samples"), - audio_channels(), - audio_frame_rate() / 1000.0, - audio_length().frames (audio_frame_rate ()) - ); - - return s.str (); -} - bool SndfileContent::valid_file (boost::filesystem::path f) { diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc index f4dd427f3..819bca321 100644 --- a/src/lib/subrip_content.cc +++ b/src/lib/subrip_content.cc @@ -77,12 +77,6 @@ SubRipContent::technical_summary () const return Content::technical_summary() + " - " + _("SubRip subtitles"); } -string -SubRipContent::information () const -{ - -} - void SubRipContent::as_xml (xmlpp::Node* node) const { diff --git a/src/lib/subrip_content.h b/src/lib/subrip_content.h index 0202e21d7..4321ecb6a 100644 --- a/src/lib/subrip_content.h +++ b/src/lib/subrip_content.h @@ -33,7 +33,6 @@ public: void examine (boost::shared_ptr<Job>, bool calculate_digest); std::string summary () const; std::string technical_summary () const; - std::string information () const; void as_xml (xmlpp::Node *) const; DCPTime full_length () const; diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index c50d466a1..1a03c2af2 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -249,30 +249,6 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d) signal_changed (ContentProperty::LENGTH); } - -string -VideoContent::information () const -{ - if (video_size().width == 0 || video_size().height == 0) { - return ""; - } - - SafeStringStream s; - - s << String::compose ( - _("%1x%2 pixels (%3:1)"), - video_size().width, - video_size().height, - setprecision (3), video_size().ratio () - ); - - if (sample_aspect_ratio ()) { - s << String::compose (_(" sample aspect ratio %1:1"), sample_aspect_ratio().get ()); - } - - return s.str (); -} - void VideoContent::set_left_crop (int c) { diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 9e5c1362f..320926190 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -51,7 +51,6 @@ public: void as_xml (xmlpp::Node *) const; std::string technical_summary () const; - virtual std::string information () const; virtual std::string identifier () const; ContentTime video_length () const { |