projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve size and positioning of Tabbable's after being torn off, hidden, reshown...
[ardour.git]
/
libs
/
ardour
/
st_stretch.cc
diff --git
a/libs/ardour/st_stretch.cc
b/libs/ardour/st_stretch.cc
index 3660ff34d385431923e5932b8f472958242b63ab..b031ee28f935c96dd892cf13c397a1ad8bee7f24 100644
(file)
--- a/
libs/ardour/st_stretch.cc
+++ b/
libs/ardour/st_stretch.cc
@@
-56,7
+56,6
@@
STStretch::STStretch (Session& s, TimeFXRequest& req)
st.setSetting(SETTING_USE_QUICKSEEK, tsr.quick_seek);
st.setSetting(SETTING_USE_AA_FILTER, tsr.antialias);
st.setSetting(SETTING_USE_QUICKSEEK, tsr.quick_seek);
st.setSetting(SETTING_USE_AA_FILTER, tsr.antialias);
- tsr.progress = 0.0f;
}
STStretch::~STStretch ()
}
STStretch::~STStretch ()
@@
-64,7
+63,7
@@
STStretch::~STStretch ()
}
int
}
int
-STStretch::run (boost::shared_ptr<Region> a_region)
+STStretch::run (boost::shared_ptr<Region> a_region
, Progress* progress
)
{
SourceList nsrcs;
framecnt_t total_frames;
{
SourceList nsrcs;
framecnt_t total_frames;
@@
-77,7
+76,7
@@
STStretch::run (boost::shared_ptr<Region> a_region)
string new_name;
string::size_type at;
string new_name;
string::size_type at;
-
tsr.progress = 0.0f
;
+
progress->set_progress (0)
;
tsr.done = false;
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(a_region);
tsr.done = false;
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(a_region);
@@
-131,7
+130,7
@@
STStretch::run (boost::shared_ptr<Region> a_region)
pos += this_read;
done += this_read;
pos += this_read;
done += this_read;
-
tsr.progress = (float) done / total_frames
;
+
progress->set_progress ((float) done / total_frames)
;
st.putSamples (buffer, this_read);
st.putSamples (buffer, this_read);
@@
-204,7
+203,5
@@
STStretch::run (boost::shared_ptr<Region> a_region)
}
}
}
}
- tsr.done = true;
-
return ret;
}
return ret;
}