Skip to content

Commit

Permalink
First stable version!
Browse files Browse the repository at this point in the history 
Remove visualization stub.
Complain explicitly if an invalid file is loaded.
Remove fluidsynth warnings from stderr.
  • Loading branch information
@chirs241097
chirs241097 committed Apr 22, 2016
1 parent 7457599 commit 446263b
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 247 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2016-04-22 0.7.2
Remove visualization stub in settings window.
Warn the user when an invalid file is loaded.
Discard fluidsynth warnings.
First stable version!

2016-04-21 0.7.2 beta
Minor change to the main window.
Added "click to copy" to the file information window.
Expand Down
7 changes: 3 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ A cross-platform midi file player based on libfluidsynth and Qt.

[Project homepage](https://chrisoft.org/QMidiPlayer/)

Now it's in beta stage. Crashes and hangs may still occur, run with gdb attatched if you could.

Features:
* Channel mute/solo
* Editing channel parameters on-the-fly
* Playlists
* Editing synthesizer effects
* Rendering midi to wave file
* Visualization using SMELT (not implemented)
* MIDI mapping (experimental, based on RtMidi)
* MIDI mapping (based on RtMidi)

Tested on Debian sid and Windows Vista~10.

A QML version is now in construction. The whole project is now being overhauled...
A QML version is now in construction. It's only a technology preview and
should not be used for non-testing purpose.
5 changes: 5 additions & 0 deletions core/qmpmidiplay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ void CMidiPlayer::fluidPreInitialize()
void CMidiPlayer::fluidInitialize()
{
synth=new_fluid_synth(settings);
fluid_set_log_function(FLUID_DBG,NULL,NULL);
fluid_set_log_function(FLUID_INFO,NULL,NULL);
fluid_set_log_function(FLUID_WARN,NULL,NULL);
fluid_set_log_function(FLUID_ERR,fluid_default_log_function,NULL);
fluid_set_log_function(FLUID_PANIC,fluid_default_log_function,NULL);
adriver=new_fluid_audio_driver(settings,synth);
fluid_synth_set_chorus(synth,FLUID_CHORUS_DEFAULT_N,FLUID_CHORUS_DEFAULT_LEVEL,
FLUID_CHORUS_DEFAULT_SPEED,FLUID_CHORUS_DEFAULT_DEPTH,
Expand Down
7 changes: 7 additions & 0 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
qmidiplayer (0.7.2-5) UNRELEASED; urgency=low

* Stable release.

-- chrisoft <[email protected]> Fri, 22 Apr 2016 21:03:32 +0800


qmidiplayer (0.7.2-4) UNRELEASED; urgency=low

* New upstream release.
Expand Down
4 changes: 3 additions & 1 deletion doc/mainwindow.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ <h1>Main Window</h1>
</ul>
<h3><a name="fileop">File operation menu</a></h3>
<ul>
<li>File Information.</li>
<li>File Information.<br>
Click an item in this dialog to copy its content.
</li>
<li>Render to Wave.<br>
It's not possible to use this action unless the player is stopped.<br>
The output wave file, with the name (source file name)+'.wav', <br>
Expand Down
13 changes: 7 additions & 6 deletions doc/miscellaneous.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,13 @@ <h3 id="build">Building QMidiPlayer from source</h3>
Please note that QMidiPlayer <i>requires</i> C++11 to build.
<h3 id="ms">Roadmap/Milestones</h3>
<ul>
<li>0.5 Basic functionality</li>
<li>0.6 Settings and experimental Windows support</li>
<li>0.7 MIDI mapping, first stable version</li>
<li>0.8 Visualization</li>
<li>0.9 Stable version</li>
<li>1.x+ Translation, documentation, Maintaince only</li>
<li>0.5.x Basic functionality</li>
<li>0.6.x Settings and experimental Windows support</li>
<li>0.7.2 MIDI mapping, first stable version</li>
<li>0.7.8 Plugin interface, UI refactoring</li>
<li>0.8.x Visualization (the default visualization plugin)</li>
<li>0.9.x Stable version</li>
<li>1.x+ Translation, documentation, Maintaince only</li>
</ul>
<h3 id="faq">FAQs</h3>
<h4>0. (Windows version) It complains about a missing dll!</h4>
Expand Down
5 changes: 3 additions & 2 deletions qmidiplayer-desktop/qmpmainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <QFont>
#include <QDirIterator>
#include <QDesktopWidget>
#include <QMessageBox>
#include "qmpmainwindow.hpp"
#include "ui_qmpmainwindow.h"
#include "../core/qmpmidiplay.hpp"
Expand All @@ -27,14 +28,14 @@ char* wcsto8bit(const wchar_t* s)
#define LOAD_FILE \
{\
char* c=wcsto8bit(fns.toStdWString().c_str());\
if(!player->playerLoadFile(c)){free(c);return;}\
if(!player->playerLoadFile(c)){free(c);QMessageBox::critical(this,tr("Error"),tr("%1 is not a valid midi file.").arg(fns));return;}\
free(c);\
}
#else
#define LOAD_SOUNDFONT \
player->pushSoundFont(settingsw->getSFWidget()->item(i)->text().toStdString().c_str())
#define LOAD_FILE \
if(!player->playerLoadFile(fns.toStdString().c_str()))return
if(!player->playerLoadFile(fns.toStdString().c_str())){QMessageBox::critical(this,tr("Error"),tr("%1 is not a valid midi file.").arg(fns));return;}
#endif
#define UPDATE_INTERVAL 66

Expand Down
161 changes: 0 additions & 161 deletions qmidiplayer-desktop/qmpsettingswindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,167 +562,6 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="lbVisualMode">
<property name="text">
<string>Visualization Mode</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbVisualMode"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="lbViewDist">
<property name="text">
<string>View distance</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>50</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSlider" name="hsViewDist">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>60</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="sbViewDist"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="lbNoteStretch">
<property name="text">
<string>Note stretch</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>60</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSlider" name="hsNoteStretch">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>60</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="sbNoteStretch"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="lbFog">
<property name="text">
<string>Fog Start</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>82</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSlider" name="hsFog">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>60</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="sbFog"/>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
Expand Down
Loading

0 comments on commit 446263b

Please sign in to comment.