summaryrefslogtreecommitdiffstats
path: root/libkmid
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-26 21:28:48 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-07-03 02:57:07 +0200
commit2afebdbe7fd3aee27f3972c78d8f5ff56c0136cf (patch)
tree1051e486f80572eba45d714b840d62d1f5a94ecd /libkmid
parent3acd2816bb3a1c274e9690e669c28c2761232cc5 (diff)
downloadtdelibs-2afebdbe7fd3aee27f3972c78d8f5ff56c0136cf.tar.gz
tdelibs-2afebdbe7fd3aee27f3972c78d8f5ff56c0136cf.zip
Fix a number of tdelibs build warnings
(cherry picked from commit 77f4891c222583c8deffc34732ccf325bac9e11b)
Diffstat (limited to 'libkmid')
-rw-r--r--libkmid/alsaout.cc2
-rw-r--r--libkmid/track.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/libkmid/alsaout.cc b/libkmid/alsaout.cc
index 73effc2e3..4c7f48f4e 100644
--- a/libkmid/alsaout.cc
+++ b/libkmid/alsaout.cc
@@ -469,7 +469,7 @@ void AlsaOut::seqbuf_clean(void)
void AlsaOut::wait(double ticks)
{
// SEQ_WAIT_TIME(((int)(ticks/convertrate)));
- time=(long int)ticks;
+ time=static_cast<long int>(ticks);
#ifdef MIDIOUTDEBUG
printfdebug("Wait >\t ticks: %g\n",ticks);
diff --git a/libkmid/track.cc b/libkmid/track.cc
index f936906e7..ccaaf69d2 100644
--- a/libkmid/track.cc
+++ b/libkmid/track.cc
@@ -334,7 +334,7 @@ void MidiTrack::readEvent(MidiEvent *ev)
case (ME_END_OF_TRACK) :
i=0;
j=0;
- while ((note[i][j]==FALSE)&&(i<16))
+ while ((i<16)&&(note[i][j]==FALSE))
{
j++;
if (j==128) { j=0; i++; };