ardour/livetrax
13
0
Fork 0
Code

Fix some trivial compiler warnings and add editor_imageframe.cc to gtk2_ardour/wscript

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5716 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Sakari Bergen 2009-10-02 11:16:15 +00:00
parent adeef356b2
commit 1928f286e9
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor.cc
View File

@ -4947,7 +4947,7 @@ Editor::remove_route (TimeAxisView *tv)
TrackViewList::iterator i;
boost::shared_ptr<Route> route;
TimeAxisView* next_tv;
TimeAxisView* next_tv = 0;
if (tv == entered_track) {
entered_track = 0;

2
gtk2_ardour/export_format_dialog.cc
View File

@ -730,7 +730,7 @@ ExportFormatDialog::update_clock (AudioClock & clock, ARDOUR::AnyTime const & ti
// TODO position
clock.set (session->convert_to_frames_at (0, time), true);
AudioClock::Mode mode;
AudioClock::Mode mode(AudioClock::SMPTE);
switch (time.type) {
case AnyTime::SMPTE:

4
gtk2_ardour/mixer_ui.cc
View File

@ -388,11 +388,11 @@ Mixer_UI::sync_order_keys (string const & src)
}
bool changed = false;
int order;
unsigned int order;
for (order = 0, ri = rows.begin(); ri != rows.end(); ++ri, ++order) {
boost::shared_ptr<Route> route = (*ri)[track_columns.route];
int old_key = order;
unsigned int old_key = order;
unsigned int new_key = route->order_key (N_("signal"));
assert (new_key < neworder.size());

1
gtk2_ardour/wscript
View File

@ -79,6 +79,7 @@ gtk2_ardour_sources = [
'editor_export_audio.cc',
'editor_group_tabs.cc',
'editor_hscroller.cc',
'editor_imageframe.cc',
'editor_keyboard.cc',
'editor_keys.cc',
'editor_markers.cc',

3
libs/ardour/event_type_map.cc
View File

@ -82,7 +82,7 @@ Evoral::ControlList::InterpolationStyle
EventTypeMap::interpolation_of(const Evoral::Parameter& param)
{
switch (param.type()) {
case MidiCCAutomation:
case MidiCCAutomation:
switch (param.id()) {
case MIDI_CTL_LSB_BANK:
case MIDI_CTL_MSB_BANK:
@ -128,6 +128,7 @@ EventTypeMap::interpolation_of(const Evoral::Parameter& param)
case MidiPitchBenderAutomation: return Evoral::ControlList::Linear; break;
default: assert(false);
}
return Evoral::ControlList::Linear; // Not reached, suppress warnings
}

2
libs/pbd/xml++.cc
View File

@ -68,7 +68,7 @@ XMLTree::read_internal(bool validate)
delete _root;
_root = 0;
xmlParserCtxtPtr ctxt; /* the parser context */
xmlParserCtxtPtr ctxt = NULL; /* the parser context */
xmlDocPtr doc; /* the resulting document tree */
xmlKeepBlanksDefault(0);