smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 13:46:30 +01:00
Code Issues Projects Releases Wiki Activity

minor fixes from OS X land

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3096 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-02-21 02:45:42 +00:00
parent 3168a35852
commit 280ade047c
6 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor_region_list.cc
View file

@ -75,8 +75,6 @@ Editor::region_hidden (boost::shared_ptr<Region> r)
void void
Editor::add_audio_regions_to_region_display (vector<boost::weak_ptr<AudioRegion> >& regions) Editor::add_audio_regions_to_region_display (vector<boost::weak_ptr<AudioRegion> >& regions)
{ {
cerr << "Adding " << regions.size() << " to region list\n";
region_list_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0)); region_list_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
for (vector<boost::weak_ptr<AudioRegion> >::iterator x = regions.begin(); x != regions.end(); ++x) { for (vector<boost::weak_ptr<AudioRegion> >::iterator x = regions.begin(); x != regions.end(); ++x) {
boost::shared_ptr<AudioRegion> region ((*x).lock()); boost::shared_ptr<AudioRegion> region ((*x).lock());
@ -360,7 +358,7 @@ Editor::region_list_display_button_press (GdkEventButton *ev)
int cellx; int cellx;
int celly; int celly;
cerr << "Button press release, button = " << ev->button << endl; // cerr << "Button press release, button = " << ev->button << endl;
if (region_list_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { if (region_list_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
if ((iter = region_list_model->get_iter (path))) { if ((iter = region_list_model->get_iter (path))) {

6
gtk2_ardour/mixer_strip.cc
View file

@ -1145,7 +1145,13 @@ MixerStrip::map_frozen ()
break; break;
} }
} }
hide_redirect_editors ();
}
void
MixerStrip::hide_redirect_editors ()
{
_route->foreach_redirect (this, &MixerStrip::hide_redirect_editor); _route->foreach_redirect (this, &MixerStrip::hide_redirect_editor);
} }

1
gtk2_ardour/mixer_strip.h
View file

@ -241,6 +241,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
void update_speed_display (); void update_speed_display ();
void map_frozen (); void map_frozen ();
void hide_redirect_editor (boost::shared_ptr<ARDOUR::Redirect> redirect); void hide_redirect_editor (boost::shared_ptr<ARDOUR::Redirect> redirect);
void hide_redirect_editors ();
bool ignore_speed_adjustment; bool ignore_speed_adjustment;

5
libs/ardour/tempo.cc
View file

@ -1178,11 +1178,12 @@ TempoMap::round_to_type (nframes_t frame, int dir, BBTPointType type)
break; break;
} }
/*
cerr << "for " << frame << " round to " << bbt << " using " cerr << "for " << frame << " round to " << bbt << " using "
<< metric.start() << metric.start()
<< endl; << endl;
*/
return metric.frame() + count_frames_between (metric.start(), bbt); return metric.frame() + count_frames_between (metric.start(), bbt);
} }

3
libs/gtkmm2ext/SConscript
View file

@ -31,6 +31,9 @@ gtkmm2ext.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
gtkmm2ext.Append(PACKAGE=domain) gtkmm2ext.Append(PACKAGE=domain)
gtkmm2ext.Append(POTFILE=domain + '.pot') gtkmm2ext.Append(POTFILE=domain + '.pot')
if gtkmm2ext['IS_OSX']:
gtkmm2ext.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
extra_sources = [] extra_sources = []
gtkmm2ext_files = Split(""" gtkmm2ext_files = Split("""

2
svn_revision.h
View file

@ -1,4 +1,4 @@
#ifndef __ardour_svn_revision_h__ #ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__ #define __ardour_svn_revision_h__
static const char* ardour_svn_revision = "3046"; static const char* ardour_svn_revision = "3095";
#endif #endif