Skip to content

Commit f866d79

Browse files
wschweerwschweer
committed
move driverFactory() into separate file
1 parent 53cb0ec commit f866d79

File tree

6 files changed

+113
-100
lines changed

6 files changed

+113
-100
lines changed

‎effects/noeffect/noeffect.qml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import QtQuick 1.1
22

33
Rectangle {
44
id: screen
5-
width: 640
6-
height: 75
7-
border.width: 2
5+
width: 642
6+
height: 77
7+
border.width: 1
88
border.color: "white"
99
radius: 5
1010
color: "#3f3f3f"
@@ -18,6 +18,7 @@ Rectangle {
1818
Text {
1919
anchors.fill: parent
2020
text: "no effect"
21+
color: "white"
2122
horizontalAlignment: Text.AlignCenter
2223
verticalAlignment: Text.AlignCenter
2324
}

‎effects/zita1/zita.qml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import QtQuick 1.1
22

33
Rectangle {
44
id: screen
5-
width: 640
6-
height: 75
7-
border.width: 2
5+
width: 642
6+
height: 77
7+
border.width: 1
88
border.color: "white"
99
radius: 5
1010
smooth: true
@@ -25,6 +25,8 @@ Rectangle {
2525
}
2626

2727
Row {
28+
x: 1
29+
y: 1
2830
Image {
2931
source: "qrc:/zita1/revsect.png"
3032
fillMode: Image.PreserveAspectCrop

‎libmscore/icon.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
// the file LICENCE.GPL
1111
//=============================================================================
1212

13-
#include <string.h>
1413
#include "xml.h"
1514
#include "icon.h"
1615

‎mscore/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ add_executable ( ${ExecutableName}
201201
musicxmlsupport.cpp exportxml.cpp importxml.cpp importxmlfirstpass.cpp
202202
savePositions.cpp pluginManager.cpp inspectorJump.cpp inspectorMarker.cpp
203203
inspectorGlissando.cpp inspectorNote.cpp paletteBoxButton.cpp
204+
driver.cpp
205+
204206
${OMR_FILES}
205207
${AUDIO}
206208
${SCRIPT_FILES}

‎mscore/driver.cpp‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
//=============================================================================
2+
// MuseScore
3+
// Music Composition & Notation
4+
//
5+
// Copyright (C) 2002-2012 Werner Schweer
6+
//
7+
// This program is free software; you can redistribute it and/or modify
8+
// it under the terms of the GNU General Public License version 2
9+
// as published by the Free Software Foundation and appearing in
10+
// the file LICENCE.GPL
11+
//=============================================================================
12+
13+
#include "config.h"
14+
#include "preferences.h"
15+
#include "driver.h"
16+
17+
#ifdef USE_JACK
18+
#include "jackaudio.h"
19+
#endif
20+
21+
#ifdef USE_PULSEAUDIO
22+
extern Driver* getPulseAudioDriver(Seq*);
23+
#endif
24+
25+
#ifdef USE_ALSA
26+
#include "alsa.h"
27+
#endif
28+
#ifdef USE_PORTAUDIO
29+
#include "pa.h"
30+
#endif
31+
32+
//---------------------------------------------------------
33+
// driverFactory
34+
//---------------------------------------------------------
35+
36+
Driver* driverFactory(Seq* seq)
37+
{
38+
Driver* driver = 0;
39+
40+
#define useJackFlag (preferences.useJackAudio || preferences.useJackMidi)
41+
#define useAlsaFlag preferences.useAlsaAudio
42+
#define usePortaudioFlag preferences.usePortaudioAudio
43+
#define usePulseAudioFlag preferences.usePulseAudio
44+
45+
#ifdef USE_PULSEAUDIO
46+
if (usePulseAudioFlag) {
47+
driver = getPulseAudioDriver(seq);
48+
if (!driver->init()) {
49+
qDebug("init PulseAudio failed");
50+
delete driver;
51+
driver = 0;
52+
}
53+
else
54+
usePortaudio = true;
55+
}
56+
#endif
57+
#ifdef USE_PORTAUDIO
58+
if (usePortaudioFlag) {
59+
driver = new Portaudio(seq);
60+
if (!driver->init()) {
61+
qDebug("init PortAudio failed");
62+
delete driver;
63+
driver = 0;
64+
}
65+
else
66+
usePortaudio = true;
67+
}
68+
#endif
69+
#ifdef USE_ALSA
70+
if (driver == 0 && useAlsaFlag) {
71+
driver = new AlsaAudio(seq);
72+
if (!driver->init()) {
73+
qDebug("init ALSA driver failed\n");
74+
delete driver;
75+
driver = 0;
76+
}
77+
else {
78+
useALSA = true;
79+
}
80+
}
81+
#endif
82+
#ifdef USE_JACK
83+
if (useJackFlag) {
84+
useAlsaFlag = false;
85+
usePortaudioFlag = false;
86+
driver = new JackAudio(seq);
87+
if (!driver->init()) {
88+
qDebug("no JACK server found\n");
89+
delete driver;
90+
driver = 0;
91+
}
92+
else
93+
useJACK = true;
94+
}
95+
#endif
96+
if (driver == 0)
97+
qDebug("no audio driver found");
98+
99+
return driver;
100+
}
101+
102+

‎mscore/musescore.cpp‎

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,6 @@
101101
#include "zerberus/zerberus.h"
102102
#endif
103103

104-
#ifdef USE_JACK
105-
#include "jackaudio.h"
106-
#endif
107-
108-
#ifdef USE_PULSEAUDIO
109-
extern Driver* getPulseAudioDriver(Seq*);
110-
#endif
111-
112-
#ifdef USE_ALSA
113-
#include "alsa.h"
114-
#endif
115-
#ifdef USE_PORTAUDIO
116-
#include "pa.h"
117-
#endif
118-
119104
MuseScore* mscore;
120105
MuseScoreCore* mscoreCore;
121106
MasterSynthesizer* synti;
@@ -2211,84 +2196,6 @@ printf("sound font <%s>\n", qPrintable(preferences.defaultSf));
22112196
return ms;
22122197
}
22132198

2214-
//---------------------------------------------------------
2215-
// driverFactory
2216-
//---------------------------------------------------------
2217-
2218-
Driver* driverFactory(Seq* seq)
2219-
{
2220-
Driver* driver = 0;
2221-
2222-
#define useJackFlag (preferences.useJackAudio || preferences.useJackMidi)
2223-
#define useAlsaFlag preferences.useAlsaAudio
2224-
#define usePortaudioFlag preferences.usePortaudioAudio
2225-
#define usePulseAudioFlag preferences.usePulseAudio
2226-
2227-
#ifdef USE_PULSEAUDIO
2228-
if (MScore::debugMode)
2229-
qDebug("usePulseAudioFlag %d\n", usePulseAudioFlag);
2230-
if (usePulseAudioFlag) {
2231-
driver = getPulseAudioDriver(seq);
2232-
if (!driver->init()) {
2233-
qDebug("init PulseAudio failed");
2234-
delete driver;
2235-
driver = 0;
2236-
}
2237-
else
2238-
usePortaudio = true;
2239-
}
2240-
#endif
2241-
#ifdef USE_PORTAUDIO
2242-
if (MScore::debugMode)
2243-
qDebug("usePortaudioFlag %d\n", usePortaudioFlag);
2244-
if (usePortaudioFlag) {
2245-
driver = new Portaudio(seq);
2246-
if (!driver->init()) {
2247-
qDebug("init PortAudio failed");
2248-
delete driver;
2249-
driver = 0;
2250-
}
2251-
else
2252-
usePortaudio = true;
2253-
}
2254-
#endif
2255-
#ifdef USE_ALSA
2256-
if (MScore::debugMode)
2257-
qDebug("useAlsaFlag %d\n", useAlsaFlag);
2258-
if (driver == 0 && useAlsaFlag) {
2259-
driver = new AlsaAudio(seq);
2260-
if (!driver->init()) {
2261-
qDebug("init ALSA driver failed\n");
2262-
delete driver;
2263-
driver = 0;
2264-
}
2265-
else {
2266-
useALSA = true;
2267-
}
2268-
}
2269-
#endif
2270-
#ifdef USE_JACK
2271-
if (MScore::debugMode)
2272-
qDebug("useJackFlag %d\n", useJackFlag);
2273-
if (useJackFlag) {
2274-
useAlsaFlag = false;
2275-
usePortaudioFlag = false;
2276-
driver = new JackAudio(seq);
2277-
if (!driver->init()) {
2278-
qDebug("no JACK server found\n");
2279-
delete driver;
2280-
driver = 0;
2281-
}
2282-
else
2283-
useJACK = true;
2284-
}
2285-
#endif
2286-
if (driver == 0)
2287-
qDebug("no audio driver found");
2288-
2289-
return driver;
2290-
}
2291-
22922199
//---------------------------------------------------------
22932200
// main
22942201
//---------------------------------------------------------

0 commit comments

Comments
 (0)