remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths...

[ardour.git] / libs / ardour / session_click.cc

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index 7161de6d78fa6d2f84c6b823702ce79ebad3be40..363c5911b8e9d9cfd00c2be6105ea1888a8335e9 100644 (file)
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 20002 Paul Davis 
+    Copyright (C) 2002 Paul Davis
 
     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
@@ -20,11 +20,12 @@
 #include <list>
 #include <cerrno>
 
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
-#include <ardour/io.h>
-#include <ardour/buffer_set.h>
+#include "ardour/ardour.h"
+#include "ardour/session.h"
+#include "ardour/tempo.h"
+#include "ardour/io.h"
+#include "ardour/buffer_set.h"
+#include "ardour/audio_buffer.h"
 
 #include <sndfile.h>
 
@@ -34,10 +35,10 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-Pool Session::Click::pool ("click", sizeof (Click), 128);
+Pool Click::pool ("click", sizeof (Click), 128);
 
 void
-Session::click (nframes_t start, nframes_t nframes, nframes_t offset)
+Session::click (nframes_t start, nframes_t nframes)
 {
        TempoMap::BBTPointList *points;
        Sample *buf;
@@ -47,13 +48,13 @@ Session::click (nframes_t start, nframes_t nframes, nframes_t offset)
        }
 
        Glib::RWLock::WriterLock clickm (click_lock, Glib::TRY_LOCK);
-       
+
        if (!clickm.locked() || _transport_speed != 1.0 || !_clicking || click_data == 0) {
-               _click_io->silence (nframes, offset);
+               _click_io->silence (nframes);
                return;
-       } 
+       }
 
-       const nframes_t end = start + (nframes_t)floor(nframes * _transport_speed);
+       const nframes_t end = start + nframes;
 
        BufferSet& bufs = get_scratch_buffers(ChanCount(DataType::AUDIO, 1));
        buf = bufs.get_audio(0).data();
@@ -79,11 +80,11 @@ Session::click (nframes_t start, nframes_t nframes, nframes_t offset)
                case TempoMap::Bar:
                        if (click_emphasis_data) {
                                clicks.push_back (new Click ((*i).frame, click_emphasis_length, click_emphasis_data));
-                       } 
+                       }
                        break;
                }
        }
-       
+
   run_clicks:
        memset (buf, 0, sizeof (Sample) * nframes);
 
@@ -97,7 +98,7 @@ Session::click (nframes_t start, nframes_t nframes, nframes_t offset)
                clk = *i;
                next = i;
                ++next;
-       
+
                if (clk->start < start) {
                        internal_offset = 0;
                } else {
@@ -105,7 +106,7 @@ Session::click (nframes_t start, nframes_t nframes, nframes_t offset)
                }
 
                if (nframes < internal_offset) {
-                        /* we've just located or something.. 
+                        /* we've just located or something..
                            effectively going backwards.
                            lets get the flock out of here */
                        break;
@@ -125,8 +126,8 @@ Session::click (nframes_t start, nframes_t nframes, nframes_t offset)
 
                i = next;
        }
-       
-       _click_io->deliver_output (bufs, start, end, nframes, offset);
+
+       _click_io->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
 }
 
 void
@@ -138,8 +139,8 @@ Session::setup_click_sounds (int which)
        clear_clicks();
 
        if ((which == 0 || which == 1)) {
-               
-               if (click_data && click_data != default_click) {
+
+               if (click_data != default_click) {
                        delete [] click_data;
                        click_data = 0;
                }
@@ -153,6 +154,7 @@ Session::setup_click_sounds (int which)
 
                } else {
 
+                       info.format = 0;
                        if ((sndfile = sf_open (path.c_str(), SFM_READ, &info)) == 0) {
                                char errbuf[256];
                                sf_error_str (0, errbuf, sizeof (errbuf) - 1);
@@ -160,25 +162,25 @@ Session::setup_click_sounds (int which)
                                _clicking = false;
                                return;
                        }
-                       
+
                        click_data = new Sample[info.frames];
                        click_length = info.frames;
-                       
+
                        if (sf_read_float (sndfile, click_data, info.frames) != info.frames) {
-                               warning << _("cannot read data from click soundfile") << endmsg;                        
+                               warning << _("cannot read data from click soundfile") << endmsg;
                                delete click_data;
                                click_data = 0;
                                _clicking = false;
                        }
-                       
+
                        sf_close (sndfile);
 
                }
        }
-               
+
        if ((which == 0 || which == -1)) {
 
-               if (click_emphasis_data && click_emphasis_data != default_click_emphasis) {
+               if (click_emphasis_data != default_click_emphasis) {
                        delete [] click_emphasis_data;
                        click_emphasis_data = 0;
                }
@@ -189,26 +191,27 @@ Session::setup_click_sounds (int which)
                        click_emphasis_data = const_cast<Sample*> (default_click_emphasis);
                        click_emphasis_length = default_click_emphasis_length;
                } else {
+                       info.format = 0;
                        if ((sndfile = sf_open (path.c_str(), SFM_READ, &info)) == 0) {
                                char errbuf[256];
                                sf_error_str (0, errbuf, sizeof (errbuf) - 1);
                                warning << string_compose (_("cannot open click emphasis soundfile %1 (%2)"), path, errbuf) << endmsg;
                                return;
                        }
-                       
+
                        click_emphasis_data = new Sample[info.frames];
                        click_emphasis_length = info.frames;
-                       
+
                        if (sf_read_float (sndfile, click_emphasis_data, info.frames) != info.frames) {
-                               warning << _("cannot read data from click emphasis soundfile") << endmsg;                       
+                               warning << _("cannot read data from click emphasis soundfile") << endmsg;
                                delete click_emphasis_data;
                                click_emphasis_data = 0;
                        }
-                       
+
                        sf_close (sndfile);
                }
        }
-}              
+}
 
 void
 Session::clear_clicks ()