Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Minuet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Education
Minuet
Commits
3c74566b
Commit
3c74566b
authored
Jun 21, 2016
by
Sandro Andrade
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Basic core implementation
parent
a5dadaf4
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
60 additions
and
43 deletions
+60
-43
src/app/CMakeLists.txt
src/app/CMakeLists.txt
+2
-1
src/app/main.cpp
src/app/main.cpp
+6
-2
src/app/minuetmainwindow.cpp
src/app/minuetmainwindow.cpp
+11
-11
src/app/minuetmainwindow.h
src/app/minuetmainwindow.h
+6
-6
src/interfaces/CMakeLists.txt
src/interfaces/CMakeLists.txt
+2
-5
src/interfaces/icore.h
src/interfaces/icore.h
+2
-2
src/interfaces/isoundbackend.cpp
src/interfaces/isoundbackend.cpp
+3
-3
src/interfaces/isoundbackend.h
src/interfaces/isoundbackend.h
+5
-5
src/shell/core.cpp
src/shell/core.cpp
+15
-5
src/shell/core.h
src/shell/core.h
+6
-1
src/shell/exercisecontroller.h
src/shell/exercisecontroller.h
+1
-1
src/shell/plugincontroller.h
src/shell/plugincontroller.h
+1
-1
No files found.
src/app/CMakeLists.txt
View file @
3c74566b
...
...
@@ -4,7 +4,7 @@ set(minuet_SRCS
main.cpp
song.cpp
wizard.cpp
minuet.cpp
minuet
mainwindow
.cpp
midisequencer.cpp
midisequenceroutputthread.cpp
exercisecontroller.cpp
...
...
@@ -27,6 +27,7 @@ target_link_libraries(minuet
KF5::XmlGui
KF5::KIOWidgets
KF5::Crash
Minuet::Shell
asound
drumstick-alsa
drumstick-file
...
...
src/app/main.cpp
View file @
3c74566b
...
...
@@ -20,7 +20,7 @@
**
****************************************************************************/
#include "minuet.h"
#include "minuet
mainwindow
.h"
#include "minuet_version.h"
...
...
@@ -35,6 +35,8 @@ Q_LOGGING_CATEGORY(MINUET, "minuet")
//#include <QQmlDebuggingEnabler>
//QQmlDebuggingEnabler enabler;
#include <shell/core.h>
int
main
(
int
argc
,
char
**
argv
)
{
QApplication
application
(
argc
,
argv
);
...
...
@@ -60,7 +62,9 @@ int main(int argc, char **argv)
aboutData
.
processCommandLine
(
&
parser
);
KAboutData
::
setApplicationData
(
aboutData
);
Minuet
*
appwindow
=
new
Minuet
;
Minuet
::
Core
::
initialize
();
MinuetMainWindow
*
appwindow
=
new
MinuetMainWindow
;
appwindow
->
show
();
return
application
.
exec
();
}
src/app/minuet.cpp
→
src/app/minuet
mainwindow
.cpp
View file @
3c74566b
...
...
@@ -20,7 +20,7 @@
**
****************************************************************************/
#include "minuet.h"
#include "minuet
mainwindow
.h"
#include "wizard.h"
#include "midisequencer.h"
...
...
@@ -41,7 +41,7 @@
#include <QToolBar>
Minuet
::
Minuet
()
:
Minuet
MainWindow
::
MinuetMainWindow
()
:
KXmlGuiWindow
(),
m_midiSequencer
(
new
MidiSequencer
(
this
)),
m_exerciseController
(
new
ExerciseController
(
m_midiSequencer
)),
...
...
@@ -72,7 +72,7 @@ Minuet::Minuet() :
QAction
*
action
=
new
QAction
(
i18n
(
"Run Configuration Wizard"
),
this
);
action
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"tools-wizard"
)));
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
Minuet
::
runWizard
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
Minuet
MainWindow
::
runWizard
);
actionCollection
()
->
addAction
(
QStringLiteral
(
"run_wizard"
),
action
);
setupGUI
(
Keys
|
Save
|
Create
);
...
...
@@ -86,7 +86,7 @@ Minuet::Minuet() :
subscribeToMidiOutputPort
();
}
void
Minuet
::
startTimidity
()
void
Minuet
MainWindow
::
startTimidity
()
{
QString
error
;
if
(
!
m_midiSequencer
->
availableOutputPorts
().
contains
(
QStringLiteral
(
"TiMidity:0"
)))
{
...
...
@@ -114,7 +114,7 @@ void Minuet::startTimidity()
i18n
(
"Minuet startup"
));
}
bool
Minuet
::
waitForTimidityOutputPorts
(
int
msecs
)
bool
Minuet
MainWindow
::
waitForTimidityOutputPorts
(
int
msecs
)
{
QTime
time
;
time
.
start
();
...
...
@@ -124,14 +124,14 @@ bool Minuet::waitForTimidityOutputPorts(int msecs)
return
true
;
}
void
Minuet
::
subscribeToMidiOutputPort
()
void
Minuet
MainWindow
::
subscribeToMidiOutputPort
()
{
QString
midiOutputPort
=
MinuetSettings
::
midiOutputPort
();
if
(
!
midiOutputPort
.
isEmpty
()
&&
m_midiSequencer
->
availableOutputPorts
().
contains
(
midiOutputPort
))
m_midiSequencer
->
subscribeTo
(
midiOutputPort
);
}
Minuet
::~
Minuet
()
Minuet
MainWindow
::~
MinuetMainWindow
()
{
delete
m_quickView
;
delete
m_exerciseController
;
...
...
@@ -143,14 +143,14 @@ Minuet::~Minuet()
qCDebug
(
MINUET
)
<<
"TiMidity++ stoped!"
;
}
bool
Minuet
::
queryClose
()
bool
Minuet
MainWindow
::
queryClose
()
{
MinuetSettings
::
self
()
->
save
();
return
true
;
}
/*
void Minuet::fileOpen()
void Minuet
MainWindow
::fileOpen()
{
QString fileName = QFileDialog::getOpenFileName(this, i18n("Open File")); // krazy:exclude=qclasses
if (!fileName.isEmpty())
...
...
@@ -158,7 +158,7 @@ void Minuet::fileOpen()
}
*/
void
Minuet
::
runWizard
()
void
Minuet
MainWindow
::
runWizard
()
{
QScopedPointer
<
Wizard
>
w
(
new
Wizard
(
this
));
if
(
w
->
exec
()
==
QDialog
::
Accepted
&&
w
->
isOk
())
{
...
...
@@ -167,7 +167,7 @@ void Minuet::runWizard()
}
}
void
Minuet
::
settingsConfigure
()
void
Minuet
MainWindow
::
settingsConfigure
()
{
if
(
KConfigDialog
::
showDialog
(
QStringLiteral
(
"settings"
)))
return
;
...
...
src/app/minuet.h
→
src/app/minuet
mainwindow
.h
View file @
3c74566b
...
...
@@ -20,8 +20,8 @@
**
****************************************************************************/
#ifndef MINUET_H
#define MINUET_H
#ifndef MINUET
MAINWINDOW
_H
#define MINUET
MAINWINDOW
_H
#include "ui_settingsmidi.h"
#include "minuetsettings.h"
...
...
@@ -46,7 +46,7 @@ Q_DECLARE_LOGGING_CATEGORY(MINUET)
* @author Sandro S. Andrade <sandroandrade@kde.org>
* @version 0.1
*/
class
Minuet
:
public
KXmlGuiWindow
class
Minuet
MainWindow
:
public
KXmlGuiWindow
{
Q_OBJECT
...
...
@@ -54,12 +54,12 @@ public:
/**
* Default Constructor
*/
Minuet
();
Minuet
MainWindow
();
/**
* Default Destructor
*/
virtual
~
Minuet
();
virtual
~
Minuet
MainWindow
();
protected:
virtual
bool
queryClose
();
...
...
@@ -90,5 +90,5 @@ private:
KProcess
m_timidityProcess
;
};
#endif // MINUET_H
#endif // MINUET
MAINWINDOW
_H
src/interfaces/CMakeLists.txt
View file @
3c74566b
...
...
@@ -2,7 +2,7 @@ set(minuetinterfaces_LIB_SRCS
icore.cpp
iplugin.cpp
iplugincontroller.cpp
i
midi
backend.cpp
i
sound
backend.cpp
iexercisecontroller.cpp
)
...
...
@@ -15,9 +15,6 @@ target_link_libraries(minuetinterfaces
Qt5::Core
)
get_target_property
(
VAR minuetinterfaces INCLUDE_DIRECTORIES
)
MESSAGE
(
STATUS
"TESTE"
"
${
VAR
}
"
)
install
(
TARGETS
minuetinterfaces
EXPORT MinuetTargets
...
...
@@ -33,7 +30,7 @@ install(FILES
icore.h
iplugin.h
iplugincontroller.h
i
midi
backend.h
i
sound
backend.h
iexercisecontroller.h
DESTINATION
${
KDE_INSTALL_INCLUDEDIR
}
/minuet/interfaces
COMPONENT Devel
...
...
src/interfaces/icore.h
View file @
3c74566b
...
...
@@ -31,7 +31,7 @@ namespace Minuet
{
class
IPluginController
;
class
I
Midi
Backend
;
class
I
Sound
Backend
;
class
IExerciseController
;
class
MINUETINTERFACES_EXPORT
ICore
:
public
QObject
...
...
@@ -44,7 +44,7 @@ public:
static
ICore
*
self
();
virtual
Minuet
::
IPluginController
*
pluginController
()
=
0
;
virtual
Minuet
::
I
MidiBackend
*
midi
Backend
()
=
0
;
virtual
Minuet
::
I
SoundBackend
*
sound
Backend
()
=
0
;
virtual
Minuet
::
IExerciseController
*
exerciseController
()
=
0
;
protected:
...
...
src/interfaces/i
midi
backend.cpp
→
src/interfaces/i
sound
backend.cpp
View file @
3c74566b
...
...
@@ -20,17 +20,17 @@
**
****************************************************************************/
#include "i
midi
backend.h"
#include "i
sound
backend.h"
namespace
Minuet
{
I
MidiBackend
::
IMidi
Backend
(
QObject
*
parent
)
I
SoundBackend
::
ISound
Backend
(
QObject
*
parent
)
:
QObject
(
parent
)
{
}
I
MidiBackend
::~
IMidi
Backend
()
I
SoundBackend
::~
ISound
Backend
()
{
}
...
...
src/interfaces/i
midi
backend.h
→
src/interfaces/i
sound
backend.h
View file @
3c74566b
...
...
@@ -20,8 +20,8 @@
**
****************************************************************************/
#ifndef MINUET_I
MIDI
BACKEND_H
#define MINUET_I
MIDI
BACKEND_H
#ifndef MINUET_I
SOUND
BACKEND_H
#define MINUET_I
SOUND
BACKEND_H
#include <QtCore/QObject>
...
...
@@ -30,13 +30,13 @@
namespace
Minuet
{
class
MINUETINTERFACES_EXPORT
I
Midi
Backend
:
public
QObject
class
MINUETINTERFACES_EXPORT
I
Sound
Backend
:
public
QObject
{
Q_OBJECT
public:
I
Midi
Backend
(
QObject
*
parent
);
~
I
Midi
Backend
()
override
;
I
Sound
Backend
(
QObject
*
parent
);
~
I
Sound
Backend
()
override
;
};
}
...
...
src/shell/core.cpp
View file @
3c74566b
...
...
@@ -22,35 +22,45 @@
#include "core.h"
#include "plugincontroller.h"
#include "exercisecontroller.h"
namespace
Minuet
{
Core
::~
Core
()
{
}
bool
Core
::
initialize
()
{
if
(
m_self
)
return
true
;
m_self
=
new
Core
()
;
m_self
=
new
Core
;
return
true
;
}
IPluginController
*
Core
::
pluginController
()
{
return
0
;
return
m_pluginController
.
data
()
;
}
I
MidiBackend
*
Core
::
midi
Backend
()
I
SoundBackend
*
Core
::
sound
Backend
()
{
return
0
;
}
IExerciseController
*
Core
::
exerciseController
()
{
return
0
;
return
m_exerciseController
.
data
()
;
}
Core
::
Core
(
QObject
*
parent
)
:
ICore
(
parent
)
:
ICore
(
parent
),
m_pluginController
(
new
PluginController
),
m_exerciseController
(
new
ExerciseController
)
{
}
...
...
src/shell/core.h
View file @
3c74566b
...
...
@@ -35,14 +35,19 @@ class MINUETSHELL_EXPORT Core : public ICore
Q_OBJECT
public:
virtual
~
Core
();
static
bool
initialize
();
virtual
IPluginController
*
pluginController
()
override
;
virtual
I
MidiBackend
*
midi
Backend
()
override
;
virtual
I
SoundBackend
*
sound
Backend
()
override
;
virtual
IExerciseController
*
exerciseController
()
override
;
private:
Core
(
QObject
*
parent
=
0
);
QScopedPointer
<
IPluginController
>
m_pluginController
;
QScopedPointer
<
IExerciseController
>
m_exerciseController
;
};
}
...
...
src/shell/exercisecontroller.h
View file @
3c74566b
...
...
@@ -37,7 +37,7 @@ class MINUETSHELL_EXPORT ExerciseController : public IExerciseController
Q_OBJECT
public:
ExerciseController
(
QObject
*
parent
);
ExerciseController
(
QObject
*
parent
=
0
);
~
ExerciseController
()
override
;
};
...
...
src/shell/plugincontroller.h
View file @
3c74566b
...
...
@@ -35,7 +35,7 @@ class MINUETSHELL_EXPORT PluginController : public IPluginController
Q_OBJECT
public:
PluginController
(
QObject
*
parent
);
PluginController
(
QObject
*
parent
=
0
);
~
PluginController
()
override
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment