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

MacOS [sic] required changes for Rect in Push 2 code

Browse source
This commit is contained in:
Paul Davis 2016-09-28 17:24:14 -04:00
parent 1aab360b7d
commit 0a9c12f250
10 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/surfaces/push2/canvas.cc
View file

@ -29,6 +29,10 @@
#include "layout.h"
#include "push2.h"
#ifdef __APPLE__
#define Rect ArdourCanvas::Rect
#endif
using namespace ArdourCanvas;
using namespace ArdourSurface;
using namespace PBD;

4
libs/surfaces/push2/knob.cc
View file

@ -37,6 +37,10 @@
#include "pbd/i18n.h"
#ifdef __APPLE__
#define Rect ArdourCanvas::Rect
#endif
using namespace PBD;
using namespace ARDOUR;
using namespace ArdourSurface;

4
libs/surfaces/push2/layout.cc
View file

@ -20,6 +20,10 @@
#include "layout.h"
#include "push2.h"
#ifdef __APPLE__
#define Rect ArdourCanvas::Rect
#endif
using namespace ARDOUR;
using namespace ArdourSurface;
using namespace ArdourCanvas;

12
libs/surfaces/push2/menu.cc
View file

@ -21,7 +21,10 @@
#include <cairomm/region.h>
#include <pangomm/layout.h>
#include "pbd/i18n.h"
#include "canvas/text.h"
#include "canvas/types.h"
#include "canvas/rectangle.h"
#include "canvas/colors.h"
@ -29,6 +32,12 @@
#include "gui.h"
#include "push2.h"
#include "menu.h"
#ifdef __APPLE__
#define Rect ArdourCanvas::Rect
#endif
using namespace ARDOUR;
using namespace std;
using namespace PBD;
@ -36,9 +45,6 @@ using namespace Glib;
using namespace ArdourSurface;
using namespace ArdourCanvas;
#include "pbd/i18n.h"
#include "menu.h"
Push2Menu::Push2Menu (Item* parent, vector<string> s)
: Container (parent)
, baseline (-1)

1
libs/surfaces/push2/menu.h
View file

@ -35,6 +35,7 @@ namespace Cairo {
namespace ArdourCanvas {
class Text;
class Rectangle;
class Rect;
}
namespace ArdourSurface {

4
libs/surfaces/push2/mix.cc
View file

@ -59,6 +59,10 @@
#include "pbd/i18n.h"
#ifdef __APPLE__
#define Rect ArdourCanvas::Rect
#endif
using namespace ARDOUR;
using namespace std;
using namespace PBD;

4
libs/surfaces/push2/scale.cc
View file

@ -29,6 +29,10 @@
#include "push2.h"
#include "scale.h"
#ifdef __APPLE__
#define Rect ArdourCanvas::Rect
#endif
using namespace ARDOUR;
using namespace std;
using namespace PBD;

4
libs/surfaces/push2/splash.cc
View file

@ -29,6 +29,10 @@
#include "splash.h"
#ifdef __APPLE__
#define Rect ArdourCanvas::Rect
#endif
using namespace ARDOUR;
using namespace PBD;
using namespace std;

7
libs/surfaces/push2/track_mix.cc
View file

@ -55,6 +55,7 @@
#include "canvas/meter.h"
#include "canvas/rectangle.h"
#include "canvas/text.h"
#include "canvas/types.h"
#include "canvas.h"
#include "knob.h"
@ -64,6 +65,10 @@
#include "track_mix.h"
#include "utils.h"
#ifdef __APPLE__
#define Rect ArdourCanvas::Rect
#endif
using namespace ARDOUR;
using namespace std;
using namespace PBD;
@ -201,7 +206,7 @@ TrackMixLayout::hide ()
}
void
TrackMixLayout::render (ArdourCanvas::Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
TrackMixLayout::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
{
Container::render (area, context);
}

1
libs/surfaces/push2/track_mix.h
View file

@ -33,6 +33,7 @@ namespace ArdourCanvas {
class Text;
class Line;
class VBox;
class Rect;
}
namespace ArdourSurface {