Martchus
/
pianobooster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some compile warning messages 

git-svn-id: https://svn.code.sf.net/p/pianobooster/code/trunk@156 ba081f5d-443b-49a7-ac4b-446c3f91f371
This commit is contained in:
louisjb 2013-09-04 23:10:24 +00:00
parent 7103a00b87
commit 5e058a7f24
10 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PianoBooster/CMakeLists.txt
View File

@ -3,6 +3,10 @@ if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
# set project's name
PROJECT( pianobooster )
ADD_SUBDIRECTORY(src build)
ADD_SUBDIRECTORY(translations build/translations)
ADD_SUBDIRECTORY(music build/music)

2
PianoBooster/src/Bar.h
View File

@ -135,8 +135,6 @@ private:
double m_playFromBar;
double m_playUptoBar;
double m_loopingBars;
int m_playFromBeat;
int m_playFromTicks;
bool m_seekingBarNumber;
bool m_flushTicks;
eventBits_t m_eventBits;

2
PianoBooster/src/CMakeLists.txt
View File

@ -57,6 +57,8 @@ IF(${CMAKE_SYSTEM} MATCHES "Linux")
#IF(ALSA_FOUND)
ADD_DEFINITIONS(-D__LINUX_ALSASEQ__)
LINK_LIBRARIES (asound)
LINK_LIBRARIES (pthread)
LINK_LIBRARIES (GL)
#ELSE(ALSA_FOUND)
# MESSAGE(FATAL_ERROR "Please install the 'libasound2-dev' package and then try again")
#ENDIF(ALSA_FOUND)

2
PianoBooster/src/Conductor.cpp
View File

@ -1097,7 +1097,7 @@ void CConductor::rewind()
m_cfg_playZoneLate = CMidiFile::ppqnAdjust(Cfg::playZoneLate()) * SPEED_ADJUST_FACTOR;
}
void CConductor::init(CScore * scoreWin, CSettings* settings)
void CConductor::init2(CScore * scoreWin, CSettings* settings)
{
int channel;

2
PianoBooster/src/Conductor.h
View File

@ -80,7 +80,7 @@ public:
CConductor();
~CConductor();
void init(CScore * scoreWin, CSettings* settings);
void init2(CScore * scoreWin, CSettings* settings);
//! add a midi event to be analysed and played

2
PianoBooster/src/GuiSidePanel.cpp
View File

@ -167,7 +167,7 @@ void GuiSidePanel::autoSetMuteYourPart()
checked = true;
if (m_song->getPlayMode() == PB_PLAY_MODE_rhythmTapping)
{
if ((m_song->cfg_rhythmTapping == PB_RHYTHM_TAP_drumsOnly))
if (m_song->cfg_rhythmTapping == PB_RHYTHM_TAP_drumsOnly)
checked = false;
}

2
PianoBooster/src/QtWindow.cpp
View File

@ -108,7 +108,7 @@ QtWindow::QtWindow()
columnLayout->addWidget(m_tutorWindow);
mainLayout->addLayout(columnLayout);
m_song->init(m_score, m_settings);
m_song->init2(m_score, m_settings);
m_sidePanel->init(m_song, m_song->getTrackList(), m_topBar);
m_topBar->init(m_song, m_song->getTrackList());

2
PianoBooster/src/ReleaseNote.txt
View File

@ -1,4 +1,4 @@
#define PB_VERSION "0.6.6.svn.31-7-12"
#define PB_VERSION "0.6.7.svn.30-08-13"
/*

4
PianoBooster/src/Song.cpp
View File

@ -30,12 +30,12 @@
#include "Score.h"
void CSong::init(CScore * scoreWin, CSettings* settings)
void CSong::init2(CScore * scoreWin, CSettings* settings)
{
CNote::setChannelHands(-2, -2); // -2 for not set -1 for none
this->CConductor::init(scoreWin, settings);
this->CConductor::init2(scoreWin, settings);
setActiveHand(PB_PART_both);
setPlayMode(PB_PLAY_MODE_followYou);

2
PianoBooster/src/Song.h
View File

@ -62,7 +62,7 @@ public:
m_findChord.reset();
}
void init(CScore * scoreWin, CSettings* settings);
void init2(CScore * scoreWin, CSettings* settings);
eventBits_t task(int ticks);
bool pcKeyPress(int key, bool down);
void loadSong(const QString &filename);