From 60e645da61933f0fb7fd67d72c17b96bf3a6daf0 Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <Jonathan.Oomph@gmail.com>
Date: Wed, 10 Oct 2012 01:07:47 -0500
Subject: [PATCH] Added a FrameRate() method to the timeline, to get or set the
 fps.  Also, added a unit test for that, and refactored some header files to
 be alphabetical.

---
 include/FFmpegReader.h       |  2 +-
 include/ImageReader.h        |  2 +-
 include/Timeline.h           | 43 +++++++++++++++++++++---------------
 src/FFmpegReader.cpp         |  2 +-
 src/ImageReader.cpp          |  2 +-
 tests/FFmpegReader_Tests.cpp |  5 +----
 tests/Timeline_Tests.cpp     | 17 ++++++++++++++
 7 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/include/FFmpegReader.h b/include/FFmpegReader.h
index 3e007a78..73b5b038 100644
--- a/include/FFmpegReader.h
+++ b/include/FFmpegReader.h
@@ -174,7 +174,7 @@ namespace openshot
 
 		/// Constructor for FFmpegReader.  This automatically opens the media file and loads
 		/// frame 1, or it throws one of the following exceptions.
-		FFmpegReader(string path);
+		FFmpegReader(string path) throw(InvalidFile, NoStreamsFound, InvalidCodec);
 
 		/// Close File
 		void Close();
diff --git a/include/ImageReader.h b/include/ImageReader.h
index 54db9c18..53f69fa9 100644
--- a/include/ImageReader.h
+++ b/include/ImageReader.h
@@ -39,7 +39,7 @@ namespace openshot
 
 		/// Constructor for ImageReader.  This automatically opens the media file and loads
 		/// frame 1, or it throws one of the following exceptions.
-		ImageReader(string path);
+		ImageReader(string path) throw(InvalidFile);
 
 		/// Close File
 		void Close();
diff --git a/include/Timeline.h b/include/Timeline.h
index bab76de9..c1e5e89a 100644
--- a/include/Timeline.h
+++ b/include/Timeline.h
@@ -52,33 +52,27 @@ namespace openshot {
 		/// Default Constructor for the timeline (which sets the canvas width and height and FPS)
 		Timeline(int width, int height, Framerate fps);
 
+		/// Add an openshot::Clip to the timeline
+		void AddClip(Clip* clip);
+
+		/// Close the reader (and any resources it was consuming)
+		void Close();
+
+		/// Get the framerate of this timeline
+		Framerate FrameRate() { return fps; };
+
+		/// Set the framerate for this timeline
+		void FrameRate(Framerate new_fps) { fps = new_fps; };
+
 		/// Get an openshot::Frame object for a specific frame number of this timeline.
 		///
 		/// @returns The requested frame (containing the image)
 		/// @param[requested_frame] number The frame number that is requested.
 		Frame* GetFrame(int requested_frame) throw(ReaderClosed);
 
-		/// Close the reader (and any resources it was consuming)
-		void Close();
-
-		/// Open the reader (and start consuming resources)
-		void Open();
-
-		/// Add an openshot::Clip to the timeline
-		void AddClip(Clip* clip);
-
-		/// Sort clips by position on the timeline
-		void SortClips();
-
-		/// Get the width of canvas and viewport
-		int Width() { return width; }
-
 		/// Get the height of canvas and viewport
 		int Height() { return height; }
 
-		/// Set the width of canvas and viewport
-		void Width(int new_width) { width = new_width; }
-
 		/// Set the height of canvas and viewport
 		void Height(int new_height) { height = new_height; }
 
@@ -86,6 +80,19 @@ namespace openshot {
 		Keyframe viewport_scale; ///<Curve representing the scale of the viewport (0 to 100)
 		Keyframe viewport_x; ///<Curve representing the x coordinate for the viewport
 		Keyframe viewport_y; ///<Curve representing the y coordinate for the viewport
+
+		/// Open the reader (and start consuming resources)
+		void Open();
+
+		/// Sort clips by position on the timeline
+		void SortClips();
+
+		/// Get the width of canvas and viewport
+		int Width() { return width; }
+
+		/// Set the width of canvas and viewport
+		void Width(int new_width) { width = new_width; }
+
 	};
 
 
diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
index c4d093b7..29308f5b 100644
--- a/src/FFmpegReader.cpp
+++ b/src/FFmpegReader.cpp
@@ -2,7 +2,7 @@
 
 using namespace openshot;
 
-FFmpegReader::FFmpegReader(string path)
+FFmpegReader::FFmpegReader(string path) throw(InvalidFile, NoStreamsFound, InvalidCodec)
 	: last_frame(0), is_seeking(0), seeking_pts(0), seeking_frame(0),
 	  audio_pts_offset(99999), video_pts_offset(99999), working_cache(12), final_cache(24), path(path),
 	  is_video_seek(true), check_interlace(false), check_fps(false), enable_seek(true),
diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp
index f782bf28..2b69cfa6 100644
--- a/src/ImageReader.cpp
+++ b/src/ImageReader.cpp
@@ -2,7 +2,7 @@
 
 using namespace openshot;
 
-ImageReader::ImageReader(string path) : path(path), is_open(false)
+ImageReader::ImageReader(string path) throw(InvalidFile) : path(path), is_open(false)
 {
 	// Init FileInfo struct (clear all values)
 	InitFileInfo();
diff --git a/tests/FFmpegReader_Tests.cpp b/tests/FFmpegReader_Tests.cpp
index 5a1efb06..24d956d1 100644
--- a/tests/FFmpegReader_Tests.cpp
+++ b/tests/FFmpegReader_Tests.cpp
@@ -6,11 +6,8 @@ using namespace openshot;
 
 TEST(FFmpegReader_Invalid_Path)
 {
-	// Create reader with invalid path
-	FFmpegReader r("");
-
 	// Check invalid path
-	CHECK_THROW(r.Open(), InvalidFile);
+	CHECK_THROW(FFmpegReader(""), InvalidFile);
 }
 
 TEST(FFmpegReader_GetFrame_Before_Opening)
diff --git a/tests/Timeline_Tests.cpp b/tests/Timeline_Tests.cpp
index 1b9d9db0..dffa97bc 100644
--- a/tests/Timeline_Tests.cpp
+++ b/tests/Timeline_Tests.cpp
@@ -46,3 +46,20 @@ TEST(Timeline_Width_and_Height_Functions)
 	CHECK_EQUAL(600, t1.Width());
 	CHECK_EQUAL(400, t1.Height());
 }
+
+TEST(Timeline_Framerate)
+{
+	// Create a default fraction (should be 1/1)
+	Framerate fps(24,1);
+	Timeline t1(640, 480, fps);
+
+	// Check values
+	CHECK_CLOSE(24.0f, t1.FrameRate().GetFPS(), 0.00001);
+
+	// Set width
+	t1.FrameRate(Framerate(30000,1001));
+
+	// Check values
+	CHECK_CLOSE(29.97002f, t1.FrameRate().GetFPS(), 0.00001);
+
+}