diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-04 22:41:10 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-04 22:41:10 -0400 |
| commit | e1b0f1bd0b03c071d2b5987e4ab75ef059e32111 (patch) | |
| tree | af840860a892166cae1c1a97cb9285ab9e4523f2 /gtk2_ardour/video_image_frame.cc | |
| parent | 2fd62f25b3202b4aa94a4afd19e9233a003f877a (diff) | |
| parent | 40944574c620868b43872f64600a8a42d382a6a1 (diff) | |
merge with master
Diffstat (limited to 'gtk2_ardour/video_image_frame.cc')
| -rw-r--r-- | gtk2_ardour/video_image_frame.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc index c892bacfa6..e9520634bb 100644 --- a/gtk2_ardour/video_image_frame.cc +++ b/gtk2_ardour/video_image_frame.cc @@ -226,7 +226,7 @@ http_get_thread (void *arg) { void VideoImageFrame::http_download_done (char *data){ if (queued_request) { - http_maybe_get_again(); + http_get_again(want_video_frame_number); return; } @@ -253,7 +253,7 @@ VideoImageFrame::http_download_done (char *data){ usleep(20000); if (queued_request) { - http_maybe_get_again(); + http_get_again(want_video_frame_number); } pthread_mutex_unlock(&request_lock); } @@ -283,7 +283,7 @@ VideoImageFrame::http_get(framepos_t fn) { } void -VideoImageFrame::http_maybe_get_again() { +VideoImageFrame::http_get_again(framepos_t /*fn*/) { pthread_mutex_lock(&queue_lock); queued_request=false; req_video_frame_number=want_video_frame_number; |