Reset buffer stats on stop. Remove unused minimum playback/capture load stats.

git-svn-id: svn://localhost/ardour2/branches/3.0@7098 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 0f5a73a28032df055e40272cbf2ddc8f20b5398c..161b6e07ec84de8da15c15594c152338e0c5e39f 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -714,11 +714,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        uint32_t playback_load ();
        uint32_t capture_load ();
-       uint32_t playback_load_min ();
-       uint32_t capture_load_min ();
-
-       void reset_playback_load_min ();
-       void reset_capture_load_min ();
 
        /* ranges */
 
@@ -1318,8 +1313,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        mutable gint _playback_load;
        mutable gint _capture_load;
-       mutable gint _playback_load_min;
-       mutable gint _capture_load_min;
 
        /* I/O bundles */
 

diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 1aa061313d00fe4e72c3668c3b96c7a8ebbc79e9..7cbbd194aebd04c0a30cfc56aeb3ddb02c3a8f9c 100644 (file)
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -119,28 +119,3 @@ Session::capture_load ()
 {
        return (uint32_t) g_atomic_int_get (&_capture_load);
 }
-
-uint32_t
-Session::playback_load_min ()
-{
-       return (uint32_t) g_atomic_int_get (&_playback_load_min);
-}
-
-uint32_t
-Session::capture_load_min ()
-{
-       return (uint32_t) g_atomic_int_get (&_capture_load_min);
-}
-
-void
-Session::reset_capture_load_min ()
-{
-       g_atomic_int_set (&_capture_load_min, 100);
-}
-
-void
-Session::reset_playback_load_min ()
-{
-       g_atomic_int_set (&_playback_load_min, 100);
-}
-

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index ee84bbbbff540bc727522588dff00209fca7600a..94527c6646192184814b6f9c636a2f057bef3c96 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -212,15 +212,8 @@ Session::get_track_statistics ()
                cworst = min (cworst, tr->capture_buffer_load());
        }
 
-       uint32_t pmin = g_atomic_int_get (&_playback_load);
-       uint32_t pminold = g_atomic_int_get (&_playback_load_min);
-       uint32_t cmin = g_atomic_int_get (&_capture_load);
-       uint32_t cminold = g_atomic_int_get (&_capture_load_min);
-
        g_atomic_int_set (&_playback_load, (uint32_t) floor (pworst * 100.0f));
        g_atomic_int_set (&_capture_load, (uint32_t) floor (cworst * 100.0f));
-       g_atomic_int_set (&_playback_load_min, min (pmin, pminold));
-       g_atomic_int_set (&_capture_load_min, min (cmin, cminold));
 
        if (actively_recording()) {
                set_dirty();

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index ee7e88caaa489868f732193a82dabb81e212f629..2739302140ccc693643eaf5aa911dfd376369ef8 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -207,8 +207,6 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        session_send_mtc = false;
        g_atomic_int_set (&_playback_load, 100);
        g_atomic_int_set (&_capture_load, 100);
-       g_atomic_int_set (&_playback_load_min, 100);
-       g_atomic_int_set (&_capture_load_min, 100);
        _play_range = false;
        _exporting = false;
        pending_abort = false;

diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 7a378e1a01be6b64a5586ded867510fb8e03f740..898af1fb59de44269594170549a7c765c6c539af 100644 (file)
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -237,6 +237,9 @@ Session::realtime_stop (bool abort, bool clear_state)
        _transport_speed = 0;
        _target_transport_speed = 0;
 
+       g_atomic_int_set (&_playback_load, 100);
+       g_atomic_int_set (&_capture_load, 100);
+
        if (config.get_use_video_sync()) {
                waiting_for_sync_offset = true;
        }