1 files changed, 11 insertions, 11 deletions

diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h
index aeb117da9f..421ba55b6d 100644
--- a/gtk2_ardour/video_image_frame.h
+++ b/gtk2_ardour/video_image_frame.h
@@ -49,14 +49,14 @@ class VideoImageFrame : public sigc::trackable
 	VideoImageFrame (PublicEditor&, ArdourCanvas::Container&, int, int, std::string, std::string);
 	virtual ~VideoImageFrame ();
 
-	void set_position (framepos_t);
-	void set_videoframe (framepos_t, int rightend = -1);
-	framepos_t get_video_frame_number() {return video_frame_number;}
+	void set_position (samplepos_t);
+	void set_videoframe (samplepos_t, int rightend = -1);
+	samplepos_t get_video_frame_number() {return video_frame_number;}
 
 	int get_height () {return clip_height;}
 	int get_width ()  {return clip_width;}
 	int get_rightend() { return rightend;}
-	framepos_t get_req_frame () {return req_video_frame_number;}
+	samplepos_t get_req_sample () {return req_video_frame_number;}
 	std::string get_video_server_url () {return video_server_url;}
 	std::string get_video_filename ()   {return video_filename;}
 
@@ -78,23 +78,23 @@ class VideoImageFrame : public sigc::trackable
 	std::string video_filename;
 
 	double        unit_position;
-	framepos_t   sample_position;
-	framepos_t   video_frame_number;
+	samplepos_t   sample_position;
+	samplepos_t   video_frame_number;
 
 	void reposition ();
 	void exposeimg ();
 
-	void fill_frame (const uint8_t r, const uint8_t g, const uint8_t b);
+	void fill_sample (const uint8_t r, const uint8_t g, const uint8_t b);
 	void draw_line ();
 	void draw_x ();
 	void cut_rightend ();
 
 
-	void http_get(framepos_t fn);
-	void http_get_again(framepos_t fn);
+	void http_get(samplepos_t fn);
+	void http_get_again(samplepos_t fn);
 
-	framepos_t req_video_frame_number;
-	framepos_t want_video_frame_number;
+	samplepos_t req_video_frame_number;
+	samplepos_t want_video_frame_number;
 	bool        queued_request;
 
 	pthread_mutex_t request_lock;