summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/ardour/audioplaylist.h14
-rw-r--r--libs/ardour/ardour/crossfade.h5
-rw-r--r--libs/ardour/ardour/playlist_templates.h2
-rw-r--r--libs/ardour/audio_playlist.cc173
-rw-r--r--libs/ardour/crossfade.cc43
-rw-r--r--libs/ardour/globals.cc5
6 files changed, 123 insertions, 119 deletions
diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 2f1b127c5a..586bf6ccc6 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -37,7 +37,7 @@ class Source;
class AudioPlaylist : public ARDOUR::Playlist
{
public:
- typedef std::list<Crossfade*> Crossfades;
+ typedef std::list<boost::shared_ptr<Crossfade> > Crossfades;
public:
AudioPlaylist (Session&, const XMLNode&, bool hidden = false);
@@ -53,9 +53,9 @@ class AudioPlaylist : public ARDOUR::Playlist
int set_state (const XMLNode&);
- sigc::signal<void,Crossfade *> NewCrossfade;
+ sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade;
- template<class T> void foreach_crossfade (T *t, void (T::*func)(Crossfade *));
+ template<class T> void foreach_crossfade (T *t, void (T::*func)(boost::shared_ptr<Crossfade>));
void crossfades_at (nframes_t frame, Crossfades&);
bool destroy_region (boost::shared_ptr<Region>);
@@ -63,7 +63,7 @@ class AudioPlaylist : public ARDOUR::Playlist
protected:
/* playlist "callbacks" */
- void notify_crossfade_added (Crossfade *);
+ void notify_crossfade_added (boost::shared_ptr<Crossfade>);
void flush_notifications ();
void finalize_split_region (boost::shared_ptr<Region> orig, boost::shared_ptr<Region> left, boost::shared_ptr<Region> right);
@@ -73,16 +73,16 @@ class AudioPlaylist : public ARDOUR::Playlist
void remove_dependents (boost::shared_ptr<Region> region);
private:
- Crossfades _crossfades; /* xfades currently in use */
+ Crossfades _crossfades;
Crossfades _pending_xfade_adds;
- void crossfade_invalidated (Crossfade*);
+ void crossfade_invalidated (boost::shared_ptr<Crossfade>);
XMLNode& state (bool full_state);
void dump () const;
bool region_changed (Change, boost::shared_ptr<Region>);
void crossfade_changed (Change);
- void add_crossfade (Crossfade&);
+ void add_crossfade (boost::shared_ptr<Crossfade>);
void source_offset_changed (boost::shared_ptr<AudioRegion> region);
};
diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index 0422698c5e..946d35b8e0 100644
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -24,6 +24,7 @@
#include <vector>
#include <algorithm>
#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
#include <sigc++/signal.h>
@@ -40,7 +41,7 @@ namespace ARDOUR {
class AudioRegion;
class Playlist;
-class Crossfade : public PBD::StatefulDestructible
+class Crossfade : public PBD::StatefulDestructible, public boost::enable_shared_from_this<ARDOUR::Crossfade>
{
public:
@@ -111,7 +112,7 @@ class Crossfade : public PBD::StatefulDestructible
void invalidate();
- sigc::signal<void,Crossfade*> Invalidated;
+ sigc::signal<void,boost::shared_ptr<Crossfade> > Invalidated;
sigc::signal<void,Change> StateChanged;
bool covers (nframes_t frame) const {
diff --git a/libs/ardour/ardour/playlist_templates.h b/libs/ardour/ardour/playlist_templates.h
index 7ce6c1818c..603e0bef37 100644
--- a/libs/ardour/ardour/playlist_templates.h
+++ b/libs/ardour/ardour/playlist_templates.h
@@ -23,7 +23,7 @@
namespace ARDOUR {
-template<class T> void AudioPlaylist::foreach_crossfade (T *t, void (T::*func)(Crossfade *)) {
+template<class T> void AudioPlaylist::foreach_crossfade (T *t, void (T::*func)(boost::shared_ptr<Crossfade>)) {
RegionLock rlock (this, false);
for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); i++) {
(t->*func) (*i);
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 0c35599332..06060061e0 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -62,7 +62,7 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, stri
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(*in_o);
// We look only for crossfades which begin with the current region, so we don't get doubles
- for (list<Crossfade *>::const_iterator xfades = other->_crossfades.begin(); xfades != other->_crossfades.end(); ++xfades) {
+ for (Crossfades::const_iterator xfades = other->_crossfades.begin(); xfades != other->_crossfades.end(); ++xfades) {
if ((*xfades)->in() == ar) {
// We found one! Now copy it!
@@ -76,8 +76,8 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, stri
if ((*xfades)->out() == ar2) {
boost::shared_ptr<AudioRegion>in = boost::dynamic_pointer_cast<AudioRegion>(*in_n);
boost::shared_ptr<AudioRegion>out = boost::dynamic_pointer_cast<AudioRegion>(*out_n);
- Crossfade *new_fade = new Crossfade (*(*xfades), in, out);
- add_crossfade(*new_fade);
+ boost::shared_ptr<Crossfade> new_fade = boost::shared_ptr<Crossfade> (new Crossfade (*(*xfades), in, out));
+ add_crossfade(new_fade);
break;
}
@@ -101,24 +101,13 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, nfra
AudioPlaylist::~AudioPlaylist ()
{
- set<Crossfade*> all_xfades;
-
GoingAway (); /* EMIT SIGNAL */
/* drop connections to signals */
notify_callbacks ();
- for (Crossfades::iterator x = _crossfades.begin(); x != _crossfades.end(); ) {
- Crossfades::iterator tmp;
-
- tmp = x;
- ++tmp;
-
- delete *x;
-
- x = tmp;
- }
+ _crossfades.clear ();
}
struct RegionSortByLayer {
@@ -164,7 +153,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
_read_data_count = 0;
map<uint32_t,vector<boost::shared_ptr<Region> > > relevant_regions;
- map<uint32_t,vector<Crossfade*> > relevant_xfades;
+ map<uint32_t,vector<boost::shared_ptr<Crossfade> > > relevant_xfades;
vector<uint32_t> relevant_layers;
for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
@@ -194,7 +183,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
for (vector<uint32_t>::iterator l = relevant_layers.begin(); l != relevant_layers.end(); ++l) {
vector<boost::shared_ptr<Region> > r (relevant_regions[*l]);
- vector<Crossfade*>& x (relevant_xfades[*l]);
+ vector<boost::shared_ptr<Crossfade> >& x (relevant_xfades[*l]);
for (vector<boost::shared_ptr<Region> >::iterator i = r.begin(); i != r.end(); ++i) {
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(*i);
@@ -203,7 +192,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
_read_data_count += ar->read_data_count();
}
- for (vector<Crossfade*>::iterator i = x.begin(); i != x.end(); ++i) {
+ for (vector<boost::shared_ptr<Crossfade> >::iterator i = x.begin(); i != x.end(); ++i) {
(*i)->read_at (buf, mixdown_buffer, gain_buffer, start, cnt, chan_n);
/* don't JACK up _read_data_count, since its the same data as we just
@@ -219,7 +208,6 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
void
AudioPlaylist::remove_dependents (boost::shared_ptr<Region> region)
{
- Crossfades::iterator i, tmp;
boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (region);
if (in_set_state) {
@@ -232,16 +220,13 @@ AudioPlaylist::remove_dependents (boost::shared_ptr<Region> region)
return;
}
- for (i = _crossfades.begin(); i != _crossfades.end(); ) {
- tmp = i;
- tmp++;
-
+ for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ) {
if ((*i)->involves (r)) {
- delete *i;
+ i = _crossfades.erase (i);
+ } else {
+ ++i;
}
-
- i = tmp;
}
}
@@ -271,7 +256,7 @@ void
AudioPlaylist::refresh_dependents (boost::shared_ptr<Region> r)
{
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(r);
- set<Crossfade*> updated;
+ set<boost::shared_ptr<Crossfade> > updated;
if (ar == 0) {
return;
@@ -312,29 +297,29 @@ AudioPlaylist::finalize_split_region (boost::shared_ptr<Region> o, boost::shared
tmp = x;
++tmp;
- Crossfade *fade = 0;
+ boost::shared_ptr<Crossfade> fade;
if ((*x)->_in == orig) {
if (! (*x)->covers(right->position())) {
- fade = new Crossfade (**x, left, (*x)->_out);
+ fade = boost::shared_ptr<Crossfade> (new Crossfade (**x, left, (*x)->_out));
} else {
// Overlap, the crossfade is copied on the left side of the right region instead
- fade = new Crossfade (**x, right, (*x)->_out);
+ fade = boost::shared_ptr<Crossfade> (new Crossfade (**x, right, (*x)->_out));
}
}
if ((*x)->_out == orig) {
if (! (*x)->covers(right->position())) {
- fade = new Crossfade (**x, (*x)->_in, right);
+ fade = boost::shared_ptr<Crossfade> (new Crossfade (**x, (*x)->_in, right));
} else {
// Overlap, the crossfade is copied on the right side of the left region instead
- fade = new Crossfade (**x, (*x)->_in, left);
+ fade = boost::shared_ptr<Crossfade> (new Crossfade (**x, (*x)->_in, left));
}
}
if (fade) {
_crossfades.remove (*x);
- add_crossfade (*fade);
+ add_crossfade (fade);
}
x = tmp;
}
@@ -347,7 +332,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
boost::shared_ptr<AudioRegion> region;
boost::shared_ptr<AudioRegion> top;
boost::shared_ptr<AudioRegion> bottom;
- Crossfade* xfade;
+ boost::shared_ptr<Crossfade> xfade;
if (in_set_state || in_partition) {
return;
@@ -369,6 +354,8 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+ nframes_t xfade_length;
+
other = boost::dynamic_pointer_cast<AudioRegion> (*i);
if (other == region) {
@@ -378,6 +365,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
if (other->muted() || region->muted()) {
continue;
}
+
if (other->layer() < region->layer()) {
top = region;
@@ -387,50 +375,55 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
bottom = region;
}
+
+ OverlapType c = top->coverage (bottom->position(), bottom->last_frame());
+
try {
+ switch (c) {
+ case OverlapNone:
+ break;
+
+ case OverlapInternal:
+ /* {=============== top =============}
+ * [ ----- bottom ------- ]
+ */
+ break;
+
+ case OverlapExternal:
+
+ /* [ -------- top ------- ]
+ * {=========== bottom =============}
+ */
- if (top->coverage (bottom->position(), bottom->last_frame()) != OverlapNone) {
+ /* to avoid discontinuities at the region boundaries of an internal
+ overlap (this region is completely within another), we create
+ two hidden crossfades at each boundary. this is not dependent
+ on the auto-xfade option, because we require it as basic
+ audio engineering.
+ */
- /* check if the upper region is within the lower region */
+ xfade_length = min ((nframes_t) 720, top->length());
- if (top->first_frame() > bottom->first_frame() &&
- top->last_frame() < bottom->last_frame()) {
-
-
- /* [ -------- top ------- ]
- * {=========== bottom =============}
- */
-
- /* to avoid discontinuities at the region boundaries of an internal
- overlap (this region is completely within another), we create
- two hidden crossfades at each boundary. this is not dependent
- on the auto-xfade option, because we require it as basic
- audio engineering.
+ xfade = boost::shared_ptr<Crossfade> (new Crossfade (top, bottom, xfade_length, top->first_frame(), StartOfIn));
+ add_crossfade (xfade);
+
+ if (top_region_at (top->last_frame() - 1) == top) {
+ /*
+ only add a fade out if there is no region on top of the end of 'top' (which
+ would cover it).
*/
- nframes_t xfade_length = min ((nframes_t) 720, top->length());
-
- /* in, out */
- xfade = new Crossfade (top, bottom, xfade_length, top->first_frame(), StartOfIn);
- add_crossfade (*xfade);
-
- if (top_region_at (top->last_frame() - 1) == top) {
- /*
- only add a fade out if there is no region on top of the end of 'top' (which
- would cover it).
- */
- xfade = new Crossfade (bottom, top, xfade_length, top->last_frame() - xfade_length, EndOfOut);
- add_crossfade (*xfade);
- }
-
- } else {
-
- xfade = new Crossfade (other, region, Config->get_xfade_model(), Config->get_xfades_active());
- add_crossfade (*xfade);
+ xfade = boost::shared_ptr<Crossfade> (new Crossfade (bottom, top, xfade_length, top->last_frame() - xfade_length, EndOfOut));
+ add_crossfade (xfade);
}
- }
+ break;
+
+ default:
+ xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, Config->get_xfade_model(), Config->get_xfades_active()));
+ add_crossfade (xfade);
+ }
}
-
+
catch (failed_constructor& err) {
continue;
}
@@ -443,29 +436,29 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
}
void
-AudioPlaylist::add_crossfade (Crossfade& xfade)
+AudioPlaylist::add_crossfade (boost::shared_ptr<Crossfade> xfade)
{
Crossfades::iterator ci;
for (ci = _crossfades.begin(); ci != _crossfades.end(); ++ci) {
- if (*(*ci) == xfade) { // Crossfade::operator==()
+ if (*(*ci) == *xfade) { // Crossfade::operator==()
break;
}
}
if (ci != _crossfades.end()) {
- delete &xfade;
+ // it will just go away
} else {
- _crossfades.push_back (&xfade);
+ _crossfades.push_back (xfade);
- xfade.Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated));
- xfade.StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed));
+ xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated));
+ xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed));
- notify_crossfade_added (&xfade);
+ notify_crossfade_added (xfade);
}
}
-void AudioPlaylist::notify_crossfade_added (Crossfade *x)
+void AudioPlaylist::notify_crossfade_added (boost::shared_ptr<Crossfade> x)
{
if (g_atomic_int_get(&block_notifications)) {
_pending_xfade_adds.insert (_pending_xfade_adds.end(), x);
@@ -475,7 +468,7 @@ void AudioPlaylist::notify_crossfade_added (Crossfade *x)
}
void
-AudioPlaylist::crossfade_invalidated (Crossfade* xfade)
+AudioPlaylist::crossfade_invalidated (boost::shared_ptr<Crossfade> xfade)
{
Crossfades::iterator i;
@@ -510,7 +503,7 @@ AudioPlaylist::set_state (const XMLNode& node)
}
try {
- Crossfade* xfade = new Crossfade (*((const Playlist *)this), *child);
+ boost::shared_ptr<Crossfade> xfade = boost::shared_ptr<Crossfade> (new Crossfade (*((const Playlist *)this), *child));
_crossfades.push_back (xfade);
xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated));
xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed));
@@ -534,19 +527,7 @@ AudioPlaylist::set_state (const XMLNode& node)
void
AudioPlaylist::clear (bool with_signals)
{
- for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ) {
-
- Crossfades::iterator tmp;
- tmp = i;
- ++tmp;
-
- delete *i;
-
- i = tmp;
- }
-
_crossfades.clear ();
-
Playlist::clear (with_signals);
}
@@ -568,7 +549,7 @@ void
AudioPlaylist::dump () const
{
boost::shared_ptr<Region>r;
- Crossfade *x;
+ boost::shared_ptr<Crossfade> x;
cerr << "Playlist \"" << _name << "\" " << endl
<< regions.size() << " regions "
@@ -608,7 +589,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (region);
bool changed = false;
Crossfades::iterator c, ctmp;
- set<Crossfade*> unique_xfades;
+ set<boost::shared_ptr<Crossfade> > unique_xfades;
if (r == 0) {
fatal << _("programming error: non-audio Region passed to remove_overlap in audio playlist")
@@ -661,10 +642,6 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
c = ctmp;
}
- for (set<Crossfade*>::iterator c = unique_xfades.begin(); c != unique_xfades.end(); ++c) {
- delete *c;
- }
-
if (changed) {
/* overload this, it normally means "removed", not destroyed */
notify_region_removed (region);
diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc
index 9e36702705..d2d04f8dc7 100644
--- a/libs/ardour/crossfade.cc
+++ b/libs/ardour/crossfade.cc
@@ -20,6 +20,8 @@
#include <sigc++/bind.h>
+#include <pbd/stacktrace.h>
+
#include <ardour/types.h>
#include <ardour/crossfade.h>
#include <ardour/crossfade_compare.h>
@@ -80,6 +82,7 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> in, boost::shared_ptr<Audio
{
_in = in;
_out = out;
+
_length = length;
_position = position;
_anchor_point = ap;
@@ -199,7 +202,8 @@ Crossfade::Crossfade (const Crossfade &orig, boost::shared_ptr<AudioRegion> newi
Crossfade::~Crossfade ()
{
- Invalidated (this);
+ cerr << "Crossfade deleted\n";
+ notify_callbacks ();
}
void
@@ -256,6 +260,8 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
/* first check for matching ends */
if (top->first_frame() == bottom->first_frame()) {
+
+ cerr << "same start\n";
/* Both regions start at the same point */
@@ -297,6 +303,8 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
} else if (top->last_frame() == bottom->last_frame()) {
+ cerr << "same end\n";
+
/* Both regions end at the same point */
if (top->first_frame() > bottom->first_frame()) {
@@ -335,17 +343,21 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
OverlapType ot = top->coverage (bottom->first_frame(), bottom->last_frame());
+ cerr << "ot = " << ot << endl;
+
switch (ot) {
case OverlapNone:
/* should be NOTREACHED as a precondition of creating
a new crossfade, but we need to handle it here.
*/
+ cerr << "no sir\n";
throw NoCrossfadeHere();
break;
case OverlapInternal:
case OverlapExternal:
/* should be NOTREACHED because of tests above */
+ cerr << "nu-uh\n";
throw NoCrossfadeHere();
break;
@@ -357,15 +369,16 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
_in = bottom;
_out = top;
- _position = bottom->first_frame();
_anchor_point = StartOfIn;
if (model == FullCrossfade) {
+ _position = bottom->first_frame(); // "{"
_length = _out->first_frame() + _out->length() - _in->first_frame();
/* leave active alone */
_follow_overlap = true;
} else {
_length = min (short_xfade_length, top->length());
+ _position = top->last_frame() - _length; // "]" - length
_active = true;
_follow_overlap = false;
@@ -499,7 +512,13 @@ Crossfade::refresh ()
/* crossfades must be between non-muted regions */
if (_out->muted() || _in->muted()) {
- Invalidated (this);
+ Invalidated (shared_from_this());
+ return false;
+ }
+
+ if (_in->layer() < _out->layer()) {
+ cerr << "layer change, invalidated\n";
+ Invalidated (shared_from_this());
return false;
}
@@ -508,11 +527,11 @@ Crossfade::refresh ()
OverlapType ot;
ot = _in->coverage (_out->first_frame(), _out->last_frame());
-
+
switch (ot) {
case OverlapNone:
case OverlapInternal:
- Invalidated (this);
+ Invalidated (shared_from_this());
return false;
default:
@@ -522,7 +541,7 @@ Crossfade::refresh ()
/* overlap type must not have altered */
if (ot != overlap_type) {
- Invalidated (this);
+ Invalidated (shared_from_this());
return false;
}
@@ -543,7 +562,7 @@ Crossfade::update (bool force)
}
if (newlen == 0) {
- Invalidated (this);
+ Invalidated (shared_from_this());
return false;
}
@@ -563,7 +582,13 @@ Crossfade::update (bool force)
switch (_anchor_point) {
case StartOfIn:
if (_position != _in->first_frame()) {
- _position = _in->first_frame();
+ if (_length > _short_xfade_length) {
+ /* assume FullCrossfade */
+ _position = _in->first_frame();
+ } else {
+ /* assume short xfade */
+ _position = _out->last_frame() - _length;
+ }
}
break;
@@ -865,5 +890,5 @@ Crossfade::set_short_xfade_length (nframes_t n)
void
Crossfade::invalidate ()
{
- Invalidated (this); /* EMIT SIGNAL */
+ Invalidated (shared_from_this()); /* EMIT SIGNAL */
}
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 3f47b30c1f..41fc3db161 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -196,6 +196,7 @@ setup_hardware_optimization (bool try_optimization)
{
bool generic_mix_functions = true;
+
if (try_optimization) {
#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
@@ -216,14 +217,14 @@ setup_hardware_optimization (bool try_optimization)
#else
asm (
- "movq $1, %%rax\n"
"pushq %%rbx\n"
+ "movq $1, %%rax\n"
"cpuid\n"
"movq %%rdx, %0\n"
"popq %%rbx\n"
: "=l" (use_sse)
:
- : "%rax", "%rcx", "%rdx", "memory");
+ : "%rax", "%rcx", "%rdx", "memory");
#endif /* USE_X86_64_ASM */
use_sse &= (1 << 25); // bit 25 = SSE support