diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
commit | 30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch) | |
tree | 620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /gtk2_ardour/video_image_frame.cc | |
parent | cb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff) |
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible
Diffstat (limited to 'gtk2_ardour/video_image_frame.cc')
-rw-r--r-- | gtk2_ardour/video_image_frame.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc index 093f235107..242d56517d 100644 --- a/gtk2_ardour/video_image_frame.cc +++ b/gtk2_ardour/video_image_frame.cc @@ -63,7 +63,7 @@ VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Container& par image = new ArdourCanvas::Image (_parent, Cairo::FORMAT_ARGB32, clip_width, clip_height); img = image->get_image(); - fill_frame(0, 0, 0); + fill_sample(0, 0, 0); draw_line(); draw_x(); image->put_image(img); @@ -80,7 +80,7 @@ VideoImageFrame::~VideoImageFrame () } void -VideoImageFrame::set_position (framepos_t sample) +VideoImageFrame::set_position (samplepos_t sample) { double new_unit_position = editor.sample_to_pixel (sample); image->move (ArdourCanvas::Duple (new_unit_position - unit_position, 0.0)); @@ -100,7 +100,7 @@ VideoImageFrame::exposeimg () { } void -VideoImageFrame::set_videoframe (framepos_t videoframenumber, int re) +VideoImageFrame::set_videoframe (samplepos_t videoframenumber, int re) { if (video_frame_number == videoframenumber && rightend == re) return; @@ -108,7 +108,7 @@ VideoImageFrame::set_videoframe (framepos_t videoframenumber, int re) rightend = re; img = image->get_image(); - fill_frame(0, 0, 0); + fill_sample(0, 0, 0); draw_x(); draw_line(); cut_rightend(); @@ -135,7 +135,7 @@ VideoImageFrame::draw_line () } void -VideoImageFrame::fill_frame (const uint8_t r, const uint8_t g, const uint8_t b) +VideoImageFrame::fill_sample (const uint8_t r, const uint8_t g, const uint8_t b) { const int rowstride = img->stride; const int clip_height = img->height; @@ -201,9 +201,9 @@ http_get_thread (void *arg) { char url[2048]; pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); - snprintf(url, sizeof(url), "%s?frame=%li&w=%d&h=%d&file=%s&format=bgra", + snprintf(url, sizeof(url), "%s?sample=%li&w=%d&h=%d&file=%s&format=bgra", vif->get_video_server_url().c_str(), - (long int) vif->get_req_frame(), vif->get_width(), vif->get_height(), + (long int) vif->get_req_sample(), vif->get_width(), vif->get_height(), vif->get_video_filename().c_str() ); int status = 0; @@ -234,7 +234,7 @@ VideoImageFrame::http_download_done (char *data){ if (!data) { /* Image request failed (HTTP error or timeout) */ img = image->get_image(); - fill_frame(128, 0, 0); + fill_sample(128, 0, 0); draw_x(); cut_rightend(); draw_line(); @@ -250,7 +250,7 @@ VideoImageFrame::http_download_done (char *data){ } exposeimg(); - /* don't request frames too quickly, wait after user has zoomed */ + /* don't request samples too quickly, wait after user has zoomed */ Glib::usleep(40000); if (queued_request) { @@ -261,7 +261,7 @@ VideoImageFrame::http_download_done (char *data){ void -VideoImageFrame::http_get(framepos_t fn) { +VideoImageFrame::http_get(samplepos_t fn) { if (pthread_mutex_trylock(&request_lock)) { pthread_mutex_lock(&queue_lock); queued_request=true; @@ -284,7 +284,7 @@ VideoImageFrame::http_get(framepos_t fn) { } void -VideoImageFrame::http_get_again(framepos_t /*fn*/) { +VideoImageFrame::http_get_again(samplepos_t /*fn*/) { pthread_mutex_lock(&queue_lock); queued_request=false; req_video_frame_number=want_video_frame_number; |