smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

merge with master

Browse source
This commit is contained in:
Paul Davis 2013-05-04 22:41:10 -04:00
commit e1b0f1bd0b
37 changed files with 1230 additions and 1181 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/video_image_frame.cc
View file

@ -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;