From 6c365f0e6a2f0cc5eb7d71a4f3ddaba3f2c2947f Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 2 Feb 2012 19:18:30 +0000 Subject: [PATCH] Remove VideoProvider::GetPosition, as it's unused and unneeded Originally committed to SVN as r6433. --- aegisub/src/include/aegisub/video_provider.h | 1 - aegisub/src/video_provider_avs.h | 1 - aegisub/src/video_provider_cache.h | 1 - aegisub/src/video_provider_dummy.h | 1 - aegisub/src/video_provider_ffmpegsource.h | 1 - aegisub/src/video_provider_yuv4mpeg.h | 1 - 6 files changed, 6 deletions(-) diff --git a/aegisub/src/include/aegisub/video_provider.h b/aegisub/src/include/aegisub/video_provider.h index c5db29f9e..de9599d57 100644 --- a/aegisub/src/include/aegisub/video_provider.h +++ b/aegisub/src/include/aegisub/video_provider.h @@ -57,7 +57,6 @@ public: virtual const AegiVideoFrame GetFrame(int n)=0; // Override the following methods to get video information: - virtual int GetPosition() const=0; ///< Get the number of the last frame loaded virtual int GetFrameCount() const=0; ///< Get total number of frames virtual int GetWidth() const=0; ///< Returns the video width in pixels virtual int GetHeight() const=0; ///< Returns the video height in pixels diff --git a/aegisub/src/video_provider_avs.h b/aegisub/src/video_provider_avs.h index 6f49e89c4..8353435dc 100644 --- a/aegisub/src/video_provider_avs.h +++ b/aegisub/src/video_provider_avs.h @@ -66,7 +66,6 @@ public: const AegiVideoFrame GetFrame(int n); - int GetPosition() const { return last_fnum; }; int GetFrameCount() const { return vi.num_frames; }; agi::vfr::Framerate GetFPS() const { return fps; }; int GetWidth() const { return vi.width; }; diff --git a/aegisub/src/video_provider_cache.h b/aegisub/src/video_provider_cache.h index 3956c2d29..5e1003748 100644 --- a/aegisub/src/video_provider_cache.h +++ b/aegisub/src/video_provider_cache.h @@ -71,7 +71,6 @@ public: virtual ~VideoProviderCache(); // Override the following methods: - int GetPosition() const { return master->GetPosition(); } int GetFrameCount() const { return master->GetFrameCount(); } int GetWidth() const { return master->GetWidth(); } int GetHeight() const { return master->GetHeight(); } diff --git a/aegisub/src/video_provider_dummy.h b/aegisub/src/video_provider_dummy.h index 484f4a1e3..1640151b9 100644 --- a/aegisub/src/video_provider_dummy.h +++ b/aegisub/src/video_provider_dummy.h @@ -77,7 +77,6 @@ public: const AegiVideoFrame GetFrame(int n); static wxString MakeFilename(double fps, int frames, int _width, int _height, const wxColour &colour, bool pattern); - int GetPosition() const { return lastFrame; } int GetFrameCount() const { return framecount; } int GetWidth() const { return width; } int GetHeight() const { return height; } diff --git a/aegisub/src/video_provider_ffmpegsource.h b/aegisub/src/video_provider_ffmpegsource.h index ad40d07b6..f688d2325 100644 --- a/aegisub/src/video_provider_ffmpegsource.h +++ b/aegisub/src/video_provider_ffmpegsource.h @@ -71,7 +71,6 @@ public: const AegiVideoFrame GetFrame(int n); - int GetPosition() const { return FrameNumber; } int GetFrameCount() const { return VideoInfo->NumFrames; } int GetWidth() const { return Width; } int GetHeight() const { return Height; } diff --git a/aegisub/src/video_provider_yuv4mpeg.h b/aegisub/src/video_provider_yuv4mpeg.h index c1c985122..9df68903e 100644 --- a/aegisub/src/video_provider_yuv4mpeg.h +++ b/aegisub/src/video_provider_yuv4mpeg.h @@ -143,7 +143,6 @@ public: const AegiVideoFrame GetFrame(int n); - int GetPosition() const { return cur_fn; } int GetFrameCount() const { return num_frames; } int GetWidth() const { return w; } int GetHeight() const { return h; }