Fix broken whitespace (no functional changes).
authorDavid Robillard <d@drobilla.net>
Mon, 4 Apr 2011 23:00:48 +0000 (23:00 +0000)
committerDavid Robillard <d@drobilla.net>
Mon, 4 Apr 2011 23:00:48 +0000 (23:00 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@9289 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/audio_diskstream.cc
libs/ardour/midi_diskstream.cc
libs/ardour/midi_ring_buffer.cc

index 2f72dbee5e2c7b112657c483d7c479ea932ac7f7..13279140856248dca1b8c197cffd95f8e5589d52 100644 (file)
@@ -162,7 +162,7 @@ AudioDiskstream::non_realtime_input_change ()
                        return;
                }
 
-                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();
 
@@ -175,11 +175,11 @@ AudioDiskstream::non_realtime_input_change ()
                        }
                }
 
-                if (input_change_pending.type & IOChange::ConnectionsChanged) {
-                        get_input_sources ();
-                        set_capture_offset ();
-                        set_align_style_from_io ();
-                }
+               if (input_change_pending.type & IOChange::ConnectionsChanged) {
+                       get_input_sources ();
+                       set_capture_offset ();
+                       set_align_style_from_io ();
+               }
 
                input_change_pending = IOChange::NoChange;
 
@@ -448,16 +448,16 @@ AudioDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool ca
                last_recordable_frame = max_framepos;
        }
 
-        if (record_enabled()) {
+       if (record_enabled()) {
 
-                OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
-                calculate_record_range (ot, transport_frame, nframes, rec_nframes, rec_offset);
+               OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
+               calculate_record_range (ot, transport_frame, nframes, rec_nframes, rec_offset);
                 
-                if (rec_nframes && !was_recording) {
-                        capture_captured = 0;
-                        was_recording = true;
-                }
-        }
+               if (rec_nframes && !was_recording) {
+                       capture_captured = 0;
+                       was_recording = true;
+               }
+       }
 
        if (can_record && !_last_capture_sources.empty()) {
                _last_capture_sources.clear ();
@@ -746,8 +746,8 @@ AudioDiskstream::overwrite_existing_buffers ()
        gain_buffer = new float[size];
 
        /* reduce size so that we can fill the buffer correctly (ringbuffers
-         * can only handle size-1, otherwise they appear to be empty)
-         */
+          can only handle size-1, otherwise they appear to be empty)
+       */
        size--;
 
        uint32_t n=0;
@@ -867,7 +867,7 @@ AudioDiskstream::internal_playback_seek (framecnt_t distance)
 int
 AudioDiskstream::read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer, 
                        framepos_t& start, framecnt_t cnt,
-                      ChannelInfo* /*channel_info*/, int channel, bool reversed)
+                       ChannelInfo* /*channel_info*/, int channel, bool reversed)
 {
        framecnt_t this_read = 0;
        bool reloop = false;
@@ -1474,8 +1474,8 @@ AudioDiskstream::transport_stopped_wallclock (struct tm& when, time_t twhen, boo
 
                        RegionFactory::region_name (region_name, whole_file_region_name, false);
                         
-                        DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1 capture start @ %2 length %3 add new region %4\n",
-                                                                              _name, (*ci)->start, (*ci)->frames, region_name));
+                       DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1 capture start @ %2 length %3 add new region %4\n",
+                                                                             _name, (*ci)->start, (*ci)->frames, region_name));
 
                        try {
 
@@ -1671,7 +1671,7 @@ AudioDiskstream::engage_record_enable ()
        if (Config->get_monitoring_model() == HardwareMonitoring) {
 
                for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
-                        (*chan)->source.ensure_monitor_input (!(_session.config.get_auto_input() && rolling));
+                       (*chan)->source.ensure_monitor_input (!(_session.config.get_auto_input() && rolling));
                        capturing_sources.push_back ((*chan)->write_source);
                        (*chan)->write_source->mark_streaming_write_started ();
                }
@@ -1693,7 +1693,7 @@ AudioDiskstream::disengage_record_enable ()
        boost::shared_ptr<ChannelList> c = channels.reader();
        if (Config->get_monitoring_model() == HardwareMonitoring) {
                for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
-                        (*chan)->source.ensure_monitor_input (false);
+                       (*chan)->source.ensure_monitor_input (false);
                }
        }
        capturing_sources.clear ();
@@ -1961,7 +1961,7 @@ AudioDiskstream::monitor_input (bool yn)
        boost::shared_ptr<ChannelList> c = channels.reader();
 
        for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
-                (*chan)->source.ensure_monitor_input (yn);
+               (*chan)->source.ensure_monitor_input (yn);
        }
 }
 
@@ -2276,21 +2276,21 @@ AudioDiskstream::adjust_capture_buffering ()
 bool
 AudioDiskstream::ChannelSource::is_physical () const
 {
-        if (name.empty()) {
-                return false;
-        }
+       if (name.empty()) {
+               return false;
+       }
 
-        return AudioEngine::instance()->port_is_physical (name);
+       return AudioEngine::instance()->port_is_physical (name);
 }
 
 void
 AudioDiskstream::ChannelSource::ensure_monitor_input (bool yn) const
 {
-        if (name.empty()) {
-                return;
-        }
+       if (name.empty()) {
+               return;
+       }
 
-        return AudioEngine::instance()->ensure_monitor_input (name, yn);
+       return AudioEngine::instance()->ensure_monitor_input (name, yn);
 }
 
 AudioDiskstream::ChannelInfo::ChannelInfo (framecnt_t playback_bufsize, framecnt_t capture_bufsize, framecnt_t speed_size, framecnt_t wrap_size)
index c3a93b813167ddce6dede853152e4558f185f3fc..6b400a02d0d3b0bf75d6872532ccd6512769efb4 100644 (file)
@@ -163,19 +163,19 @@ MidiDiskstream::non_realtime_input_change ()
 
                if (input_change_pending.type & IOChange::ConfigurationChanged) {
                        if (_io->n_ports().n_midi() != _n_channels.n_midi()) {
-                                error << string_compose (_("%1: I/O configuration change %4 requested to use %2, but channel setup is %3"),
-                                                         name(),
-                                                         _io->n_ports(),
-                                                       _n_channels, input_change_pending.type)
-                                      << endmsg;
+                               error << string_compose (_("%1: I/O configuration change %4 requested to use %2, but channel setup is %3"),
+                                                        name(),
+                                                        _io->n_ports(),
+                                                        _n_channels, input_change_pending.type)
+                                     << endmsg;
                        }
                }
 
-                if (input_change_pending.type & IOChange::ConnectionsChanged) {
-                        get_input_sources ();
-                        set_capture_offset ();
-                        set_align_style_from_io ();
-                }
+               if (input_change_pending.type & IOChange::ConnectionsChanged) {
+                       get_input_sources ();
+                       set_capture_offset ();
+                       set_align_style_from_io ();
+               }
 
                input_change_pending.type = IOChange::NoChange;
 
@@ -640,7 +640,7 @@ MidiDiskstream::overwrite_existing_buffers ()
        g_atomic_int_set (&_frames_written_to_ringbuffer, 0);
 
        read (overwrite_frame, disk_io_chunk_frames, false);
-        file_frame = overwrite_frame; // it was adjusted by ::read()
+       file_frame = overwrite_frame; // it was adjusted by ::read()
        overwrite_queued = false;
        _pending_overwrite = false;
 
@@ -1433,21 +1433,23 @@ MidiDiskstream::get_playback (MidiBuffer& dst, framepos_t start, framepos_t end)
                return;
        }
 
-       // Translates stamps to be relative to start
+       // Translate stamps to be relative to start
 
 
 #ifndef NDEBUG
-        DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("%1 MDS pre-read read from %2 write to %3\n", 
-                                                              _name, 
-                                                              _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr()));
+       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
+                            "%1 MDS pre-read read from %2 write to %3\n", _name, 
+                            _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr()));
 //        cerr << "================\n";
 //        _playback_buf->dump (cerr);
 //        cerr << "----------------\n";
 
        const size_t events_read = _playback_buf->read(dst, start, end);
-       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("%1 MDS events read %2 range %3 .. %4 rspace %5 wspace %6 r@%7 w@%8\n", _name, events_read, start, end,
-                                                             _playback_buf->read_space(), _playback_buf->write_space(),
-                                                              _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr()));
+       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
+                            "%1 MDS events read %2 range %3 .. %4 rspace %5 wspace %6 r@%7 w@%8\n",
+                            _name, events_read, start, end,
+                            _playback_buf->read_space(), _playback_buf->write_space(),
+                        _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr()));
 #else
        _playback_buf->read(dst, start, end);
 #endif
index 27361c0b95e5580e3934583e3ba4d29dae60c48b..850313cc12c7c83177d85c329bc96acc2790967f 100644 (file)
@@ -47,7 +47,7 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
        /* If we see the end of a loop during this read, we must write the events after it
           to the MidiBuffer with adjusted times.  The situation is as follows:
 
-           session frames----------------------------->
+          session frames----------------------------->
           
                     |                            |                    |
                start_of_loop                   start              end_of_loop
@@ -179,67 +179,67 @@ MidiRingBuffer<T>::dump(ostream& str)
        Evoral::EventType ev_type;
        uint32_t          ev_size;
 
-        RingBufferNPT<uint8_t>::rw_vector vec;
-        RingBufferNPT<uint8_t>::get_read_vector (&vec);
+       RingBufferNPT<uint8_t>::rw_vector vec;
+       RingBufferNPT<uint8_t>::get_read_vector (&vec);
 
-        if (vec.len[0] == 0) {
-                return;
-        }
+       if (vec.len[0] == 0) {
+               return;
+       }
 
        str << this << ": Dump size = " << vec.len[0] + vec.len[1] 
-            << " r@ " << RingBufferNPT<uint8_t>::get_read_ptr() 
-            << " w@" << RingBufferNPT<uint8_t>::get_write_ptr() << endl;
+           << " r@ " << RingBufferNPT<uint8_t>::get_read_ptr() 
+           << " w@" << RingBufferNPT<uint8_t>::get_write_ptr() << endl;
 
 
-        uint8_t *buf = new uint8_t[vec.len[0] + vec.len[1]];
-        memcpy (buf, vec.buf[0], vec.len[0]);
+       uint8_t *buf = new uint8_t[vec.len[0] + vec.len[1]];
+       memcpy (buf, vec.buf[0], vec.len[0]);
 
-        if (vec.len[1]) {
-                memcpy (buf+vec.len[1], vec.buf[1], vec.len[1]);
-        }
+       if (vec.len[1]) {
+               memcpy (buf+vec.len[1], vec.buf[1], vec.len[1]);
+       }
 
-        uint8_t* data = buf;
-        const uint8_t* end = buf + vec.len[0] + vec.len[1];
+       uint8_t* data = buf;
+       const uint8_t* end = buf + vec.len[0] + vec.len[1];
 
-        while (data < end) {
+       while (data < end) {
                 
                memcpy (&ev_time, data, sizeof (T));
-                data += sizeof (T);
+               data += sizeof (T);
                str << "\ttime " << ev_time;
 
-                if (data >= end) {
-                        str << "(incomplete)\n ";
-                        break;
-                }
+               if (data >= end) {
+                       str << "(incomplete)\n ";
+                       break;
+               }
 
                memcpy (&ev_type, data, sizeof (ev_type));
-                data += sizeof (ev_type);
+               data += sizeof (ev_type);
                str << " type " << ev_type;
 
-                if (data >= end) {
-                        str << "(incomplete)\n";
-                        break;
-                }
+               if (data >= end) {
+                       str << "(incomplete)\n";
+                       break;
+               }
 
                memcpy (&ev_size, data, sizeof (ev_size));
-                data += sizeof (ev_size);
+               data += sizeof (ev_size);
                str << " size " << ev_size;
 
-                if (data >= end) {
-                        str << "(incomplete)\n";
-                        break;
-                }
+               if (data >= end) {
+                       str << "(incomplete)\n";
+                       break;
+               }
 
                for (uint32_t i = 0; i != ev_size && data < end; ++i) {
                        str << ' ' << hex << (int) data[i] << dec;
                }
 
-                data += ev_size;
+               data += ev_size;
 
                str << endl;
        }
 
-        delete [] buf;
+       delete [] buf;
 }
 
 template class MidiRingBuffer<framepos_t>;