Fix thinkos in cubasish theme

[ardour.git] / gtk2_ardour / video_image_frame.h

diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h
index b611ff0d9e6886364d4025831f9e00a65bd766fb..9a293784d6b2793c026d1b0f9cf2a354eacda0e2 100644 (file)
--- a/gtk2_ardour/video_image_frame.h
+++ b/gtk2_ardour/video_image_frame.h
@@ -1,28 +1,24 @@
 /*
-    Copyright (C) 2010 Paul Davis
-    Author: Robin Gareus <robin@gareus.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2013-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2013-2017 Robin Gareus <robin@gareus.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 #ifndef __ardour_video_image_frame_h__
 #define __ardour_video_image_frame_h__
 
-#define ARDOUR_USER_AGENT (PROGRAM_NAME VERSIONSTRING)
-#define ARDOUR_CURL_TIMEOUT (60)
-
 #include <string>
 #include <glib.h>
 
@@ -32,7 +28,7 @@
 #include "ardour/ardour.h"
 #include "pbd/signals.h"
 
-#include "canvas/group.h"
+#include "canvas/container.h"
 #include "canvas/pixbuf.h"
 #include "canvas/image.h"
 
@@ -49,17 +45,17 @@ class PublicEditor;
 class VideoImageFrame : public sigc::trackable
 {
        public:
-       VideoImageFrame (PublicEditor&, ArdourCanvas::Group&, int, int, std::string, std::string);
+       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_frame () {return req_video_frame_number;}
        std::string get_video_server_url () {return video_server_url;}
        std::string get_video_filename ()   {return video_filename;}
 
@@ -69,7 +65,7 @@ class VideoImageFrame : public sigc::trackable
        protected:
 
        PublicEditor& editor;
-       ArdourCanvas::Group *_parent;
+       ArdourCanvas::Container *_parent;
        ArdourCanvas::Image *image;
        boost::shared_ptr<ArdourCanvas::Image::Data> img;
 
@@ -81,8 +77,8 @@ 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 ();
@@ -93,11 +89,11 @@ class VideoImageFrame : public sigc::trackable
        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;