allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

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

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7098 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2010-05-12 00:29:28 +00:00
parent 73c717c6fc
commit 5670e2c3a4
5 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ardour/ardour/session.h
View File

@@ -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 */

25
libs/ardour/session_butler.cc
View File

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

7
libs/ardour/session_process.cc
View File

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

2
libs/ardour/session_state.cc
View File

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

3
libs/ardour/session_transport.cc
View File

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