repeat play, in/out <> shortcuts, append to proj wording, cleanup

[goodguy/history.git] / cinelerra-5.1 / cinelerra / audioidevice.C

diff --git a/cinelerra-5.1/cinelerra/audioidevice.C b/cinelerra-5.1/cinelerra/audioidevice.C
index 7cd858be603ce510330e2f5e57b50e28329bd611..acc870576e3c41921af6cf91b69cc8d230f6a8d9 100644 (file)
--- a/cinelerra-5.1/cinelerra/audioidevice.C
+++ b/cinelerra-5.1/cinelerra/audioidevice.C
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "audiodevice.h"
@@ -200,6 +200,7 @@ while( is_recording ) {
                                else {
                                        --input_buffer_count;
                                        printf("AudioDevice::run_input: buffer overflow\n");
+                                       result = 1;
                                }
                                ibfr = &input[input_buffer_in];
                                ibfr->size = 0;
@@ -208,7 +209,7 @@ while( is_recording ) {
                        buffer_lock->unlock();
                        polling_lock->unlock();
                }
-               else {
+               if( result ) {
                        perror("AudioDevice::run_input");
                        usleep(250000);
                }
@@ -219,7 +220,7 @@ void AudioDevice::end_input()
 {
        is_recording = 0;
        polling_lock->unlock();
-       buffer_lock->unlock();
+       buffer_lock->reset();
 }
 
 int AudioDevice::reset_input()
@@ -302,7 +303,7 @@ void AudioDevice::monitor_buffer(Samples **data, int channels,
                        delete lowlevel_out;
                        lowlevel_out = 0;
                }
-               int ret = open_output(out_config, 
+               int ret = open_output(out_config,
                        in_samplerate, in_samples, channels, in_realtime );
                monitor_open = !ret ? 1 : 0;
                if( monitor_open ) {