projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repeat INSENSITIVE colors instead of relying on inheritance
[ardour.git]
/
libs
/
ardour
/
audio_diskstream.cc
diff --git
a/libs/ardour/audio_diskstream.cc
b/libs/ardour/audio_diskstream.cc
index 6f7c2d62297bfd392c28330e34dce335cc651820..330b9d582acda0367d509993f54c0b1b2b98e339 100644
(file)
--- a/
libs/ardour/audio_diskstream.cc
+++ b/
libs/ardour/audio_diskstream.cc
@@
-56,7
+56,7
@@
#include "ardour/types.h"
#include "ardour/utils.h"
#include "ardour/types.h"
#include "ardour/utils.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
#include <locale.h>
using namespace std;
#include <locale.h>
using namespace std;
@@
-168,7
+168,7
@@
AudioDiskstream::non_realtime_input_change ()
need_write_sources = true;
}
need_write_sources = true;
}
- if (input_change_pending.type
==
IOChange::ConfigurationChanged) {
+ if (input_change_pending.type
&
IOChange::ConfigurationChanged) {
RCUWriter<ChannelList> writer (channels);
boost::shared_ptr<ChannelList> c = writer.get_copy();
RCUWriter<ChannelList> writer (channels);
boost::shared_ptr<ChannelList> c = writer.get_copy();
@@
-359,7
+359,7
@@
AudioDiskstream::use_destructive_playlist ()
boost::shared_ptr<Region> rp;
{
boost::shared_ptr<Region> rp;
{
- const RegionList& rl (_playlist->region_list().rlist());
+ const RegionList& rl (_playlist->region_list
_property
().rlist());
if (rl.size() > 0) {
assert((rl.size() == 1));
rp = rl.front();
if (rl.size() > 0) {
assert((rl.size() == 1));
rp = rl.front();
@@
-377,9
+377,9
@@
AudioDiskstream::use_destructive_playlist ()
throw failed_constructor();
}
throw failed_constructor();
}
- /* be sure to stretch the region out to the maximum length */
+ /* be sure to stretch the region out to the maximum length
(non-musical)
*/
- region->set_length (max_framepos - region->position());
+ region->set_length (max_framepos - region->position()
, 0
);
uint32_t n;
ChannelList::iterator chan;
uint32_t n;
ChannelList::iterator chan;
@@
-1895,7
+1895,7
@@
AudioDiskstream::get_state ()
{
XMLNode& node (Diskstream::get_state());
char buf[64] = "";
{
XMLNode& node (Diskstream::get_state());
char buf[64] = "";
- LocaleGuard lg
(X_("C"))
;
+ LocaleGuard lg;
boost::shared_ptr<ChannelList> c = channels.reader();
snprintf (buf, sizeof(buf), "%u", (unsigned int) c->size());
boost::shared_ptr<ChannelList> c = channels.reader();
snprintf (buf, sizeof(buf), "%u", (unsigned int) c->size());
@@
-1932,12
+1932,12
@@
AudioDiskstream::get_state ()
int
AudioDiskstream::set_state (const XMLNode& node, int version)
{
int
AudioDiskstream::set_state (const XMLNode& node, int version)
{
-
const XMLProperty
* prop;
+
XMLProperty const
* prop;
XMLNodeList nlist = node.children();
XMLNodeIterator niter;
uint32_t nchans = 1;
XMLNode* capture_pending_node = 0;
XMLNodeList nlist = node.children();
XMLNodeIterator niter;
uint32_t nchans = 1;
XMLNode* capture_pending_node = 0;
- LocaleGuard lg
(X_("C"))
;
+ LocaleGuard lg;
/* prevent write sources from being created */
/* prevent write sources from being created */
@@
-2237,11
+2237,11
@@
AudioDiskstream::playback_buffer_load () const
boost::shared_ptr<ChannelList> c = channels.reader();
if (c->empty ()) {
boost::shared_ptr<ChannelList> c = channels.reader();
if (c->empty ()) {
- return 0;
+ return
1.
0;
}
return (float) ((double) c->front()->playback_buf->read_space()/
}
return (float) ((double) c->front()->playback_buf->read_space()/
- (double) c->front()->playback_buf->bufsize());
+
(double) c->front()->playback_buf->bufsize());
}
float
}
float
@@
-2250,7
+2250,7
@@
AudioDiskstream::capture_buffer_load () const
boost::shared_ptr<ChannelList> c = channels.reader();
if (c->empty ()) {
boost::shared_ptr<ChannelList> c = channels.reader();
if (c->empty ()) {
- return 0;
+ return
1.
0;
}
return (float) ((double) c->front()->capture_buf->write_space()/
}
return (float) ((double) c->front()->capture_buf->write_space()/
@@
-2260,7
+2260,7
@@
AudioDiskstream::capture_buffer_load () const
int
AudioDiskstream::use_pending_capture_data (XMLNode& node)
{
int
AudioDiskstream::use_pending_capture_data (XMLNode& node)
{
-
const XMLProperty
* prop;
+
XMLProperty const
* prop;
XMLNodeList nlist = node.children();
XMLNodeIterator niter;
boost::shared_ptr<AudioFileSource> fs;
XMLNodeList nlist = node.children();
XMLNodeIterator niter;
boost::shared_ptr<AudioFileSource> fs;
@@
-2435,7
+2435,7
@@
AudioDiskstream::can_become_destructive (bool& requires_bounce) const
boost::shared_ptr<Region> first;
{
boost::shared_ptr<Region> first;
{
- const RegionList& rl (_playlist->region_list().rlist());
+ const RegionList& rl (_playlist->region_list
_property
().rlist());
assert((rl.size() == 1));
first = rl.front();
assert((rl.size() == 1));
first = rl.front();