Make import GUI report if you are importing a file of a name that

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

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index 250adfe4cc0c6e94f706e1657b3cc9501fab32d4..f48054c532c76517fdea9a1278b29650c456aa4e 100644 (file)
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <list>
@@ -32,22 +31,25 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 
 Pool Session::Click::pool ("click", sizeof (Click), 128);
 
 void
-Session::click (jack_nframes_t start, jack_nframes_t nframes, jack_nframes_t offset)
+Session::click (nframes_t start, nframes_t nframes, nframes_t offset)
 {
        TempoMap::BBTPointList *points;
-       jack_nframes_t end;
+       nframes_t end;
        Sample *buf;
        vector<Sample*> bufs;
 
        if (_click_io == 0) {
                return;
        }
+
+       Glib::RWLock::WriterLock clickm (click_lock, Glib::TRY_LOCK);
        
-       if (_transport_speed != 1.0 || !_clicking || click_data == 0) {
+       if (!clickm.locked() || _transport_speed != 1.0 || !_clicking || click_data == 0) {
                _click_io->silence (nframes, offset);
                return;
        } 
@@ -61,34 +63,35 @@ Session::click (jack_nframes_t start, jack_nframes_t nframes, jack_nframes_t off
                goto run_clicks;
        }
 
-       if (points->empty()) {
-               delete points;
-               goto run_clicks;
-       }
-
-       for (TempoMap::BBTPointList::iterator i = points->begin(); i != points->end(); ++i) {
-               switch ((*i).type) {
-               case TempoMap::Beat:
-                       if (click_emphasis_data == 0 || (click_emphasis_data && (*i).beat != 1)) {
-                               clicks.push_back (new Click ((*i).frame, click_length, click_data));
+       if (!points->empty()) {
+
+               for (TempoMap::BBTPointList::iterator i = points->begin(); i != points->end(); ++i) {
+                       switch ((*i).type) {
+                       case TempoMap::Beat:
+                               if (click_emphasis_data == 0 || (click_emphasis_data && (*i).beat != 1)) {
+                                       clicks.push_back (new Click ((*i).frame, click_length, click_data));
+                               }
+                               break;
+                               
+                       case TempoMap::Bar:
+                               if (click_emphasis_data) {
+                                       clicks.push_back (new Click ((*i).frame, click_emphasis_length, click_emphasis_data));
+                               } 
+                               break;
                        }
-                       break;
-
-               case TempoMap::Bar:
-                       if (click_emphasis_data) {
-                               clicks.push_back (new Click ((*i).frame, click_emphasis_length, click_emphasis_data));
-                       } 
-                       break;
                }
        }
-
+       
+       delete points;
+       
   run_clicks:
+       
        memset (buf, 0, sizeof (Sample) * nframes);
 
        for (list<Click*>::iterator i = clicks.begin(); i != clicks.end(); ) {
 
-               jack_nframes_t copy;
-               jack_nframes_t internal_offset;
+               nframes_t copy;
+               nframes_t internal_offset;
                Click *clk;
                list<Click*>::iterator next;
 
@@ -142,17 +145,19 @@ Session::setup_click_sounds (int which)
                        click_data = 0;
                }
 
-               if (click_sound.length() == 0) {
+               string path = Config->get_click_sound();
+
+               if (path.empty()) {
 
                        click_data = const_cast<Sample*> (default_click);
                        click_length = default_click_length;
 
                } else {
 
-                       if ((sndfile = sf_open (click_sound.c_str(), SFM_READ, &info)) == 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 soundfile %1 (%2)"), click_sound, errbuf) << endmsg;
+                               warning << string_compose (_("cannot open click soundfile %1 (%2)"), path, errbuf) << endmsg;
                                _clicking = false;
                                return;
                        }
@@ -179,14 +184,16 @@ Session::setup_click_sounds (int which)
                        click_emphasis_data = 0;
                }
 
-               if (click_emphasis_sound.length() == 0) {
+               string path = Config->get_click_emphasis_sound();
+
+               if (path.empty()) {
                        click_emphasis_data = const_cast<Sample*> (default_click_emphasis);
                        click_emphasis_length = default_click_emphasis_length;
                } else {
-                       if ((sndfile = sf_open (click_emphasis_sound.c_str(), SFM_READ, &info)) == 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)"), click_emphasis_sound, errbuf) << endmsg;
+                               warning << string_compose (_("cannot open click emphasis soundfile %1 (%2)"), path, errbuf) << endmsg;
                                return;
                        }
                        
@@ -207,7 +214,7 @@ Session::setup_click_sounds (int which)
 void
 Session::clear_clicks ()
 {
-       LockMonitor lm (route_lock, __LINE__, __FILE__);
+       Glib::RWLock::WriterLock lm (click_lock);
 
        for (Clicks::iterator i = clicks.begin(); i != clicks.end(); ++i) {
                delete *i;
@@ -215,46 +222,3 @@ Session::clear_clicks ()
 
        clicks.clear ();
 }
-
-void
-Session::set_click_sound (string path)
-{
-       if (path != click_sound) {
-               click_sound = path;
-               setup_click_sounds (1);
-       }
-}
-
-void
-Session::set_click_emphasis_sound (string path)
-{
-       if (path != click_emphasis_sound) {
-               click_emphasis_sound = path;
-               setup_click_sounds (-1);
-       }
-}
-
-void
-Session::set_clicking (bool yn)
-{
-       if (click_requested != yn) {
-               click_requested = yn;
-               
-               if (yn) {
-                       if (_click_io && click_data) {
-                               _clicking = true;
-                       }
-               } else {
-                       _clicking = false;
-               }
-
-                ControlChanged (Clicking); /* EMIT SIGNAL */
-       }
-}
-
-bool
-Session::get_clicking () const
-{
-       return click_requested;
-}
-