Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/HerrSteiner/gravel
Browse files Browse the repository at this point in the history
  • Loading branch information
MKTSteiner committed Dec 10, 2022
2 parents 1635bb6 + 5900bf6 commit 19b0317
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions instrumentdefinition.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#ifndef INSTRUMENTDEFINITION_H
#define INSTRUMENTDEFINITION_H
#import <QtCore>
#import "parameter.h"
#include <QtCore>
#include "parameter.h"

class InstrumentDefinition
{
Expand Down
6 changes: 3 additions & 3 deletions parameter.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#ifndef PARAMETER_H
#define PARAMETER_H

#import <QRandomGenerator>
#import <QString>
#import <QList>
#include <QRandomGenerator>
#include <QString>
#include <QList>

typedef enum {
SINGLE,
Expand Down
2 changes: 1 addition & 1 deletion patternEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define PATTERNEVENT_H

#include "parameter.h"
#import <QMap>
#include <QMap>

class PatternEvent
{
Expand Down
2 changes: 1 addition & 1 deletion soundengine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void SoundEngine::process(void)
}
// start Csound thread
Csound *csound = new Csound();
QString csd = "/Users/herrsteiner/Projects/gravel/csoundIntruments.csd";
QString csd = "csoundIntruments.csd";
//QString csd = "csoundIntruments.csd";
emit parseCsound(csd);
int result = csound->CompileCsd(qPrintable(csd));
Expand Down

0 comments on commit 19b0317

Please sign in to comment.