qsampler-devel Mailing List for Qsampler (Page 3)
A LinuxSampler Qt GUI Interface
Brought to you by:
rncbc
Menu
▾
▴
qsampler-devel — qsampler development discussion mailing list
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(2) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
(5) |
Nov
|
Dec
(14) |
| 2009 |
Jan
|
Feb
(3) |
Mar
(5) |
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
(12) |
Sep
|
Oct
(5) |
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2020 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2021 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2022 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2023 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2024 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rui N. C. <rn...@us...> - 2009-03-25 15:13:54
|
Update of /cvsroot/qsampler/qsampler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11958 Added Files: TRANSLATORS Log Message: * Russian (qsampler_ru.ts by Alexandre Prokoudine) makes it as brand first translation delivered. Thanks and welcomes who ever may follow ;) --- NEW FILE: TRANSLATORS --- Russian (ru) Alexandre Prokoudine <ale...@gm...> |
|
From: Rui N. C. <rn...@us...> - 2009-03-25 15:13:54
|
Update of /cvsroot/qsampler/qsampler/translations In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11958/translations Added Files: qsampler_ru.ts Log Message: * Russian (qsampler_ru.ts by Alexandre Prokoudine) makes it as brand first translation delivered. Thanks and welcomes who ever may follow ;) --- NEW FILE: qsampler_ru.ts --- <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS><TS version="1.1" language="ru"> <defaultcodec></defaultcodec> <context> <name>MidiInstrumentsModel</name> <message> <location filename="../src/qsamplerInstrumentList.cpp" line="151"/> <source>Name</source> <translation>Ðазвание</translation> </message> <message> <location filename="../src/qsamplerInstrumentList.cpp" line="152"/> <source>Map</source> <translation>ÐаÑÑа</translation> </message> <message> <location filename="../src/qsamplerInstrumentList.cpp" line="153"/> <source>Bank</source> <translation>Ðанк</translation> [...2901 lines suppressed...] <source>9</source> <translation>9</translation> </message> <message> <location filename="../src/qsamplerOptionsForm.ui" line="1364"/> <source>10</source> <translation>10</translation> </message> <message> <location filename="../src/qsamplerOptionsForm.ui" line="1369"/> <source>11</source> <translation>11</translation> </message> <message> <location filename="../src/qsamplerOptionsForm.ui" line="1374"/> <source>12</source> <translation>12</translation> </message> </context> </TS> |
|
From: Rui N. C. <rn...@us...> - 2009-03-25 15:12:56
|
Update of /cvsroot/qsampler/qsampler/translations In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11825/translations Log Message: Directory /cvsroot/qsampler/qsampler/translations added to the repository |
|
From: Rui N. C. <rn...@us...> - 2009-03-25 15:10:42
|
Update of /cvsroot/qsampler/qsampler/win32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11638/win32 Modified Files: config.h qsampler.pro Log Message: * Russian (qsampler_ru.ts by Alexandre Prokoudine) makes it as brand first translation delivered. Thanks and welcomes who ever may follow ;) Index: config.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/win32/config.h,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- config.h 19 Feb 2009 11:43:35 -0000 1.53 +++ config.h 25 Mar 2009 15:10:02 -0000 1.54 @@ -1,6 +1,6 @@ #define PACKAGE_NAME "Qsampler" -#define PACKAGE_VERSION "0.2.1.24" +#define PACKAGE_VERSION "0.2.1.25" #define CONFIG_PREFIX "." #define CONFIG_DEBUG 1 Index: qsampler.pro =================================================================== RCS file: /cvsroot/qsampler/qsampler/win32/qsampler.pro,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- qsampler.pro 19 Feb 2008 09:24:51 -0000 1.13 +++ qsampler.pro 25 Mar 2009 15:10:02 -0000 1.14 @@ -62,3 +62,5 @@ INCPATH += C:\usr\local\include LIBS += -LC:\usr\local\lib -lws2_32 } + +TRANSLATIONS = ../translations/qsampler_ru.ts |
|
From: Rui N. C. <rn...@us...> - 2009-03-25 15:10:24
|
Update of /cvsroot/qsampler/qsampler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11638 Modified Files: ChangeLog Makefile.in configure.ac qsampler.pro.in Log Message: * Russian (qsampler_ru.ts by Alexandre Prokoudine) makes it as brand first translation delivered. Thanks and welcomes who ever may follow ;) Index: qsampler.pro.in =================================================================== RCS file: /cvsroot/qsampler/qsampler/qsampler.pro.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- qsampler.pro.in 25 Dec 2008 17:06:51 -0000 1.26 +++ qsampler.pro.in 25 Mar 2009 15:10:01 -0000 1.27 @@ -55,6 +55,8 @@ CONFIG += qt thread warn_on @ac_debug@ LANGUAGE = C++ +TRANSLATIONS += translations/qsampler_ru.ts + LIBS += @ac_libs@ INCPATH += @ac_incpath@ Index: Makefile.in =================================================================== RCS file: /cvsroot/qsampler/qsampler/Makefile.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Makefile.in 18 Feb 2008 23:04:10 -0000 1.22 +++ Makefile.in 25 Mar 2009 15:10:01 -0000 1.23 @@ -1,5 +1,7 @@ prefix = @ac_prefix@ qmake = @ac_qmake@ +lupdate = @ac_lupdate@ +lrelease = @ac_lrelease@ name = qsampler @@ -54,7 +56,13 @@ src/qsamplerOptionsForm.ui \ src/qsamplerMainForm.ui -all: $(name) +translations_sources = \ + translations/qsampler_ru.ts + +translations_targets = \ + translations/qsampler_ru.qm + +all: $(name) $(translations_targets) $(name).mak: $(name).pro @$(qmake) -o $(name).mak $(name).pro @@ -62,6 +70,11 @@ $(name): $(name).mak $(sources) $(headers) $(forms) @make -f $(name).mak +%.ts: $(name).pro $(sources) $(headers) $(forms) + @$(lupdate) -verbose $(name).pro + +%.qm: %.ts + @$(lrelease) -verbose $< -qm $@ # NOTE: DO NOT DELETE $(DESTDIR) in install and uninstall rules !!! # It is mandatory for Debian packaging. @@ -70,16 +83,21 @@ @install -d -v -m 0755 $(DESTDIR)$(prefix)/bin @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications + @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale @install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name) @install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png @install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop + @install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale uninstall: $(DESTDIR)$(prefix)/bin/$(name) @rm -vf $(DESTDIR)$(prefix)/bin/$(name) @rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png @rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop + @rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets) + @for x in $(translations_targets); do \ + rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done clean: $(name).mak @make -f $(name).mak clean @rm -f $(name) $(name).mak - @rm -rf *.cache *.log *.status + @rm -rf *.cache *.log *.status $(translations_targets) Index: configure.ac =================================================================== RCS file: /cvsroot/qsampler/qsampler/configure.ac,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- configure.ac 19 Feb 2009 11:43:34 -0000 1.75 +++ configure.ac 25 Mar 2009 15:10:01 -0000 1.76 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.2.1.24, rn...@rn..., qsampler) +AC_INIT(Qsampler, 0.2.1.25, rn...@rn..., qsampler) AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui) AC_CONFIG_HEADERS(config.h) @@ -139,6 +139,20 @@ fi AC_SUBST(ac_uic) +# Check for Qt lupdate utility. +AC_PATH_PROG(ac_lupdate, lupdate, [no], $ac_path) +if test "x$ac_lupdate" = "xno"; then + AC_MSG_ERROR([lupdate $ac_errmsg]) +fi +AC_SUBST(ac_lupdate) + +# Check for Qt lrelease utility. +AC_PATH_PROG(ac_lrelease, lrelease, [no], $ac_path) +if test "x$ac_release" = "xno"; then + AC_MSG_ERROR([lrelease $ac_errmsg]) +fi +AC_SUBST(ac_lrelease) + # Checks for libraries. AC_CHECK_LIB(m, main) AC_CHECK_LIB(X11, main) Index: ChangeLog =================================================================== RCS file: /cvsroot/qsampler/qsampler/ChangeLog,v retrieving revision 1.144 retrieving revision 1.145 diff -u -d -r1.144 -r1.145 --- ChangeLog 19 Feb 2009 11:43:34 -0000 1.144 +++ ChangeLog 25 Mar 2009 15:10:00 -0000 1.145 @@ -5,6 +5,10 @@ CVS HEAD +* Russian (qsampler_ru.ts by Alexandre Prokoudine) makes it as + brand first translation delivered. Thanks and welcomes whom + ever may follow ;) + * Converted obsolete QMessageBox forms to standard buttons. * Added support for runtime max. voices / disk streams setting |
Update of /cvsroot/qsampler/qsampler/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32589/src Modified Files: qsamplerChannelForm.cpp qsamplerChannelForm.h qsamplerChannelForm.ui qsamplerDeviceForm.cpp qsamplerDeviceForm.h qsamplerDeviceForm.ui qsamplerInstrumentForm.cpp qsamplerInstrumentForm.h qsamplerInstrumentForm.ui qsamplerInstrumentListForm.cpp qsamplerInstrumentListForm.h qsamplerInstrumentListForm.ui qsamplerMainForm.cpp qsamplerMainForm.h qsamplerMainForm.ui qsamplerOptionsForm.cpp qsamplerOptionsForm.h qsamplerOptionsForm.ui Log Message: * Converted obsolete QMessageBox forms to standard buttons. Index: qsamplerChannelForm.ui =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerChannelForm.ui,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- qsamplerChannelForm.ui 26 Nov 2007 22:28:07 -0000 1.31 +++ qsamplerChannelForm.ui 19 Feb 2009 11:43:35 -0000 1.32 @@ -2,7 +2,7 @@ <author>rncbc aka Rui Nuno Capela</author> <comment>qsampler - A LinuxSampler Qt GUI Interface. - Copyright (C) 2005-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2005-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerOptionsForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptionsForm.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- qsamplerOptionsForm.cpp 20 Dec 2008 23:22:04 -0000 1.6 +++ qsamplerOptionsForm.cpp 19 Feb 2009 11:43:35 -0000 1.7 @@ -1,7 +1,7 @@ // qsamplerOptionsForm.cpp // /**************************************************************************** - Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or @@ -341,11 +341,13 @@ QSAMPLER_TITLE ": " + tr("Warning"), tr("Some settings have been changed.\n\n" "Do you want to apply the changes?"), - tr("Apply"), tr("Discard"), tr("Cancel"))) { - case 0: // Apply... + QMessageBox::Apply | + QMessageBox::Discard | + QMessageBox::Cancel)) { + case QMessageBox::Apply: accept(); return; - case 1: // Discard + case QMessageBox::Discard: break; default: // Cancel. bReject = false; Index: qsamplerInstrumentForm.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerInstrumentForm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- qsamplerInstrumentForm.h 6 Dec 2007 10:14:08 -0000 1.2 +++ qsamplerInstrumentForm.h 19 Feb 2009 11:43:35 -0000 1.3 @@ -1,7 +1,7 @@ // qsamplerInstrumentForm.h // /**************************************************************************** - Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerMainForm.ui =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerMainForm.ui,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- qsamplerMainForm.ui 18 Feb 2008 23:04:10 -0000 1.55 +++ qsamplerMainForm.ui 19 Feb 2009 11:43:35 -0000 1.56 @@ -2,7 +2,7 @@ <author>rncbc aka Rui Nuno Capela</author> <comment>qsampler - A LinuxSampler Qt GUI Interface. - Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, 2008 Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerOptionsForm.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptionsForm.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- qsamplerOptionsForm.h 20 Dec 2008 23:22:04 -0000 1.4 +++ qsamplerOptionsForm.h 19 Feb 2009 11:43:35 -0000 1.5 @@ -1,7 +1,7 @@ // qsamplerOptionsForm.h // /**************************************************************************** - Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerMainForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerMainForm.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- qsamplerMainForm.cpp 22 Dec 2008 10:01:23 -0000 1.11 +++ qsamplerMainForm.cpp 19 Feb 2009 11:43:35 -0000 1.12 @@ -1,7 +1,7 @@ // qsamplerMainForm.cpp // /**************************************************************************** - Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, 2008 Christian Schoenebeck This program is free software; you can redistribute it and/or @@ -759,7 +759,8 @@ "\"%1\"\n\n" "Do you want to replace it?") .arg(sFilename), - tr("Replace"), tr("Cancel")) > 0) + QMessageBox::Yes | QMessageBox::No) + == QMessageBox::No) return false; } } @@ -782,11 +783,13 @@ "\"%1\"\n\n" "Do you want to save the changes?") .arg(sessionName(m_sFilename)), - tr("Save"), tr("Discard"), tr("Cancel"))) { - case 0: // Save... + QMessageBox::Save | + QMessageBox::Discard | + QMessageBox::Cancel)) { + case QMessageBox::Save: bClose = saveSession(false); // Fall thru.... - case 1: // Discard + case QMessageBox::Discard: break; default: // Cancel. bClose = false; @@ -1307,7 +1310,8 @@ "Please note that this operation may cause\n" "temporary MIDI and Audio disruption.\n\n" "Do you want to reset the sampler engine now?"), - tr("Reset"), tr("Cancel")) > 0) + QMessageBox::Ok | QMessageBox::Cancel) + == QMessageBox::Cancel) return; // Trye closing the current session, first... @@ -1348,7 +1352,7 @@ "Please note that this operation may cause\n" "temporary MIDI and Audio disruption.\n\n" "Do you want to restart the connection now?"), - tr("Restart"), tr("Cancel")) == 0); + QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok); } // Are we still for it? @@ -1429,7 +1433,8 @@ "%1\n\n" "Are you sure?") .arg(pChannelStrip->windowTitle()), - tr("OK"), tr("Cancel")) > 0) + QMessageBox::Ok | QMessageBox::Cancel) + == QMessageBox::Cancel) return; } @@ -1647,7 +1652,7 @@ QMessageBox::information(this, QSAMPLER_TITLE ": " + tr("Information"), tr("Some settings may be only effective\n" - "next time you start this program."), tr("OK")); + "next time you start this program.")); updateMessagesCapture(); } // Check wheather something immediate has changed. @@ -2228,7 +2233,7 @@ QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); QMessageBox::critical(this, - QSAMPLER_TITLE ": " + tr("Error"), s, tr("Cancel")); + QSAMPLER_TITLE ": " + tr("Error"), s, QMessageBox::Cancel); } @@ -2516,17 +2521,13 @@ // Is the server process instance still here? if (m_pServer) { - switch (QMessageBox::warning(this, + if (QMessageBox::warning(this, QSAMPLER_TITLE ": " + tr("Warning"), tr("Could not start the LinuxSampler server.\n\n" "Maybe it is already started."), - tr("Stop"), tr("Kill"), tr("Cancel"))) { - case 0: + QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) { m_pServer->terminate(); - break; - case 1: m_pServer->kill(); - break; } return; } @@ -2602,7 +2603,7 @@ "sampler session at any time by relaunching QSampler.\n\n" "Do you want LinuxSampler to stop or to keep running in\n" "the background?"), - tr("Stop"), tr("Keep Running")) == 1) + QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) { bForceServerStop = false; } Index: qsamplerChannelForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerChannelForm.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- qsamplerChannelForm.cpp 5 May 2008 17:50:25 -0000 1.3 +++ qsamplerChannelForm.cpp 19 Feb 2009 11:43:35 -0000 1.4 @@ -1,7 +1,7 @@ // qsamplerChannelForm.cpp // /**************************************************************************** - Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, 2008 Christian Schoenebeck This program is free software; you can redistribute it and/or @@ -439,11 +439,13 @@ QSAMPLER_TITLE ": " + tr("Warning"), tr("Some channel settings have been changed.\n\n" "Do you want to apply the changes?"), - tr("Apply"), tr("Discard"), tr("Cancel"))) { - case 0: // Apply... + QMessageBox::Apply | + QMessageBox::Discard | + QMessageBox::Cancel)) { + case QMessageBox::Apply: accept(); return; - case 1: // Discard + case QMessageBox::Discard: break; default: // Cancel. bReject = false; Index: qsamplerDeviceForm.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerDeviceForm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- qsamplerDeviceForm.h 6 Dec 2007 10:14:08 -0000 1.2 +++ qsamplerDeviceForm.h 19 Feb 2009 11:43:35 -0000 1.3 @@ -1,7 +1,7 @@ // qsamplerDeviceForm.h // /**************************************************************************** - Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerDeviceForm.ui =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerDeviceForm.ui,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- qsamplerDeviceForm.ui 6 Dec 2007 10:14:08 -0000 1.25 +++ qsamplerDeviceForm.ui 19 Feb 2009 11:43:35 -0000 1.26 @@ -2,7 +2,7 @@ <author>rncbc aka Rui Nuno Capela</author> <comment>qsampler - A LinuxSampler Qt GUI Interface. - Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerInstrumentForm.ui =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerInstrumentForm.ui,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- qsamplerInstrumentForm.ui 26 Nov 2007 22:28:08 -0000 1.6 +++ qsamplerInstrumentForm.ui 19 Feb 2009 11:43:35 -0000 1.7 @@ -2,7 +2,7 @@ <author>rncbc aka Rui Nuno Capela</author> <comment>qsampler - A LinuxSampler Qt GUI Interface. - Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerDeviceForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerDeviceForm.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- qsamplerDeviceForm.cpp 5 Feb 2008 17:21:00 -0000 1.3 +++ qsamplerDeviceForm.cpp 19 Feb 2009 11:43:35 -0000 1.4 @@ -1,7 +1,7 @@ // qsamplerDeviceForm.cpp // /**************************************************************************** - Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, 2008 Christian Schoenebeck This program is free software; you can redistribute it and/or @@ -279,7 +279,8 @@ "%1\n\n" "Are you sure?") .arg(device.deviceName()), - tr("OK"), tr("Cancel")) > 0) + QMessageBox::Ok | QMessageBox::Cancel) + == QMessageBox::Cancel) return; } Index: qsamplerInstrumentForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerInstrumentForm.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- qsamplerInstrumentForm.cpp 6 Dec 2007 10:14:08 -0000 1.2 +++ qsamplerInstrumentForm.cpp 19 Feb 2009 11:43:35 -0000 1.3 @@ -1,7 +1,7 @@ // qsamplerInstrumentForm.cpp // /**************************************************************************** - Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or @@ -369,11 +369,13 @@ QSAMPLER_TITLE ": " + tr("Warning"), tr("Some channel settings have been changed.\n\n" "Do you want to apply the changes?"), - tr("Apply"), tr("Discard"), tr("Cancel"))) { - case 0: // Apply... + QMessageBox::Apply | + QMessageBox::Discard | + QMessageBox::Cancel)) { + case QMessageBox::Apply: accept(); return; - case 1: // Discard + case QMessageBox::Discard: break; default: // Cancel. bReject = false; Index: qsamplerInstrumentListForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerInstrumentListForm.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- qsamplerInstrumentListForm.cpp 6 Dec 2007 10:14:08 -0000 1.2 +++ qsamplerInstrumentListForm.cpp 19 Feb 2009 11:43:35 -0000 1.3 @@ -1,7 +1,7 @@ // qsamplerInstrumentListForm.cpp // /**************************************************************************** - Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or @@ -308,7 +308,8 @@ "%1\n\n" "Are you sure?") .arg(pInstrument->name()), - tr("OK"), tr("Cancel")) > 0) + QMessageBox::Ok | QMessageBox::Cancel) + == QMessageBox::Cancel) return; } Index: qsamplerInstrumentListForm.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerInstrumentListForm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- qsamplerInstrumentListForm.h 6 Dec 2007 10:14:08 -0000 1.2 +++ qsamplerInstrumentListForm.h 19 Feb 2009 11:43:35 -0000 1.3 @@ -1,7 +1,7 @@ // qsamplerInstrumentListForm.h // /**************************************************************************** - Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerOptionsForm.ui =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptionsForm.ui,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- qsamplerOptionsForm.ui 22 Dec 2008 18:19:08 -0000 1.32 +++ qsamplerOptionsForm.ui 19 Feb 2009 11:43:35 -0000 1.33 @@ -2,7 +2,7 @@ <author>rncbc aka Rui Nuno Capela</author> <comment>qsampler - A LinuxSampler Qt GUI Interface. - Copyright (C) 2005-2008, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2005-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerChannelForm.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerChannelForm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- qsamplerChannelForm.h 6 Dec 2007 10:14:08 -0000 1.2 +++ qsamplerChannelForm.h 19 Feb 2009 11:43:35 -0000 1.3 @@ -1,7 +1,7 @@ // qsamplerChannelForm.h // /**************************************************************************** - Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerMainForm.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerMainForm.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- qsamplerMainForm.h 18 Feb 2008 23:04:10 -0000 1.4 +++ qsamplerMainForm.h 19 Feb 2009 11:43:35 -0000 1.5 @@ -1,7 +1,7 @@ // qsamplerMainForm.h // /**************************************************************************** - Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, 2008 Christian Schoenebeck This program is free software; you can redistribute it and/or Index: qsamplerInstrumentListForm.ui =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerInstrumentListForm.ui,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- qsamplerInstrumentListForm.ui 26 Nov 2007 22:28:08 -0000 1.3 +++ qsamplerInstrumentListForm.ui 19 Feb 2009 11:43:35 -0000 1.4 @@ -2,7 +2,7 @@ <author>rncbc aka Rui Nuno Capela</author> <comment>qsampler - A LinuxSampler Qt GUI Interface. - Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or |
|
From: Rui N. C. <rn...@us...> - 2009-02-19 13:11:41
|
Update of /cvsroot/qsampler/qsampler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32589 Modified Files: ChangeLog configure.ac Log Message: * Converted obsolete QMessageBox forms to standard buttons. Index: configure.ac =================================================================== RCS file: /cvsroot/qsampler/qsampler/configure.ac,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- configure.ac 25 Dec 2008 17:06:51 -0000 1.74 +++ configure.ac 19 Feb 2009 11:43:34 -0000 1.75 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.2.1.23, rn...@rn..., qsampler) +AC_INIT(Qsampler, 0.2.1.24, rn...@rn..., qsampler) AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui) AC_CONFIG_HEADERS(config.h) Index: ChangeLog =================================================================== RCS file: /cvsroot/qsampler/qsampler/ChangeLog,v retrieving revision 1.143 retrieving revision 1.144 diff -u -d -r1.143 -r1.144 --- ChangeLog 22 Dec 2008 10:01:23 -0000 1.143 +++ ChangeLog 19 Feb 2009 11:43:34 -0000 1.144 @@ -5,6 +5,8 @@ CVS HEAD +* Converted obsolete QMessageBox forms to standard buttons. + * Added support for runtime max. voices / disk streams setting (accessible from the "Options..." dialog). Those fine tuning settings will be saved in case the user modified them and |
|
From: Rui N. C. <rn...@us...> - 2009-02-19 13:11:37
|
Update of /cvsroot/qsampler/qsampler/win32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32589/win32 Modified Files: config.h Log Message: * Converted obsolete QMessageBox forms to standard buttons. Index: config.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/win32/config.h,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- config.h 25 Dec 2008 17:06:51 -0000 1.52 +++ config.h 19 Feb 2009 11:43:35 -0000 1.53 @@ -1,6 +1,6 @@ #define PACKAGE_NAME "Qsampler" -#define PACKAGE_VERSION "0.2.1.23" +#define PACKAGE_VERSION "0.2.1.24" #define CONFIG_PREFIX "." #define CONFIG_DEBUG 1 |
|
From: Rui N. C. <rn...@us...> - 2008-12-25 17:07:02
|
Update of /cvsroot/qsampler/qsampler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17151 Modified Files: Makefile.cvs configure.ac qsampler.pro.in Log Message: - Bumped autoconf stuff to avoid any newer cache warnings. Index: qsampler.pro.in =================================================================== RCS file: /cvsroot/qsampler/qsampler/qsampler.pro.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- qsampler.pro.in 18 Feb 2008 23:04:10 -0000 1.25 +++ qsampler.pro.in 25 Dec 2008 17:06:51 -0000 1.26 @@ -58,6 +58,10 @@ LIBS += @ac_libs@ INCPATH += @ac_incpath@ +OBJECTS_DIR = .obj +MOC_DIR = .moc +UI_DIR = .ui + macx { QMAKE_MAC_SDK = $$(SDKROOT) CONFIG += $$(QMAKE_ARCHS) Index: configure.ac =================================================================== RCS file: /cvsroot/qsampler/qsampler/configure.ac,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- configure.ac 22 Dec 2008 18:19:08 -0000 1.73 +++ configure.ac 25 Dec 2008 17:06:51 -0000 1.74 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.2.1.22, rn...@rn..., qsampler) +AC_INIT(Qsampler, 0.2.1.23, rn...@rn..., qsampler) AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui) AC_CONFIG_HEADERS(config.h) @@ -104,13 +104,12 @@ # Check for proper Qt version. AC_CACHE_CHECK([for Qt library version >= 4.1], - ac_qtlib_version, [ + ac_cv_qtversion, [ AC_TRY_LINK([#include "Qt/qglobal.h"], [ #if QT_VERSION < 0x040100 #error Qt library 4.1 or greater required. #endif - ], - ac_qtlib_version="yes", [ + ], ac_cv_qtversion="yes", [ echo "no; Qt 4.1 or greater is required" exit ]) @@ -159,24 +158,26 @@ ac_libs="$ac_libs -llscp" AC_CACHE_CHECK([for instrument_name in lscp_channel_info_t], - ac_instrument_name, [ + ac_cv_instrument_name, [ AC_TRY_COMPILE([#include "lscp/client.h"], [ lscp_channel_info_t info; info.instrument_name = 0; - ], ac_instrument_name="yes", ac_instrument_name="no") + ], ac_cv_instrument_name="yes", ac_cv_instrument_name="no") ]) +ac_instrument_name=$ac_cv_instrument_name if test "x$ac_instrument_name" = "xyes"; then AC_DEFINE(CONFIG_INSTRUMENT_NAME, 1, [Define if instrument_name is available.]) fi AC_CACHE_CHECK([for mute/solo in lscp_channel_info_t], - ac_mute_solo, [ + ac_cv_mute_solo, [ AC_TRY_COMPILE([#include "lscp/client.h"], [ lscp_channel_info_t info; info.mute = 0; info.solo = 0; - ], ac_mute_solo="yes", ac_mute_solo="no") + ], ac_cv_mute_solo="yes", ac_cv_mute_solo="no") ]) +ac_mute_solo=$ac_cv_mute_solo if test "x$ac_mute_solo" = "xyes"; then AC_CHECK_LIB(lscp, lscp_set_channel_mute, [ac_mute_solo="yes"], [ac_mute_solo="no"]) fi @@ -196,12 +197,13 @@ if test "x$ac_fxsend" = "xyes"; then AC_DEFINE(CONFIG_FXSEND, 1, [Define if FX sends is available.]) AC_CACHE_CHECK([for FX send level in lscp_fxsend_info_t], - ac_fxsend_level, [ + ac_cv_fxsend_level, [ AC_TRY_COMPILE([#include "lscp/client.h"], [ lscp_fxsend_info_t info; info.level = 0.0f; - ], ac_fxsend_level="yes", ac_fxsend_level="no") + ], ac_cv_fxsend_level="yes", ac_cv_fxsend_level="no") ]) + ac_fxsend_level=$ac_cv_fxsend_level if test "x$ac_fxsend_level" = "xyes"; then AC_DEFINE(CONFIG_FXSEND_LEVEL, 1, [Define if FX send level is available.]) fi @@ -212,12 +214,13 @@ fi AC_CACHE_CHECK([for audio_routing array type], - ac_audio_routing, [ + ac_cv_audio_routing, [ AC_TRY_COMPILE([#include "lscp/client.h"], [ lscp_channel_info_t info; char ch = info.audio_routing[0][0]; - ], ac_audio_routing="no", ac_audio_routing="yes") + ], ac_cv_audio_routing="no", ac_cv_audio_routing="yes") ]) +ac_audio_routing=$ac_cv_audio_routing if test "x$ac_audio_routing" = "xyes"; then AC_DEFINE(CONFIG_AUDIO_ROUTING, 1, [Define if audio_routing is an integer array.]) fi @@ -233,30 +236,32 @@ fi AC_CACHE_CHECK([for CHANNEL_MIDI LSCP event support in liblscp], - ac_lscp_channel_midi_event, [ + ac_cv_channel_midi_event, [ AC_TRY_COMPILE([ #include "lscp/client.h" #include "lscp/event.h" ], [ lscp_event_t ev; ev = LSCP_EVENT_CHANNEL_MIDI; - ], ac_lscp_channel_midi_event="yes", ac_lscp_channel_midi_event="no") + ], ac_cv_channel_midi_event="yes", ac_cv_channel_midi_event="no") ]) -if test "x$ac_lscp_channel_midi_event" = "xyes"; then +ac_channel_midi_event=$ac_cv_channel_midi_event +if test "x$ac_channel_midi_event" = "xyes"; then AC_DEFINE(CONFIG_EVENT_CHANNEL_MIDI, 1, [Define if LSCP CHANNEL_MIDI event support is available.]) fi AC_CACHE_CHECK([for DEVICE_MIDI LSCP event support in liblscp], - ac_lscp_device_midi_event, [ + ac_cv_device_midi_event, [ AC_TRY_COMPILE([ #include "lscp/client.h" #include "lscp/event.h" ], [ lscp_event_t ev; ev = LSCP_EVENT_DEVICE_MIDI; - ], ac_lscp_device_midi_event="yes", ac_lscp_device_midi_event="no") + ], ac_cv_device_midi_event="yes", ac_cv_device_midi_event="no") ]) -if test "x$ac_lscp_device_midi_event" = "xyes"; then +ac_device_midi_event=$ac_cv_device_midi_event +if test "x$ac_device_midi_event" = "xyes"; then AC_DEFINE(CONFIG_EVENT_DEVICE_MIDI, 1, [Define if LSCP DEVICE_MIDI event support is available.]) fi @@ -346,8 +351,8 @@ if test "x$ac_libgig" = "xyes"; then echo " libgig supports fast information retrieval . . . .: $have_libgig_setautoload" fi -echo " LSCP channel MIDI event support . . . . . . . . .: $ac_lscp_channel_midi_event" -echo " LSCP device MIDI event support . . . . . . . . . .: $ac_lscp_device_midi_event" +echo " LSCP channel MIDI event support . . . . . . . . .: $ac_channel_midi_event" +echo " LSCP device MIDI event support . . . . . . . . . .: $ac_device_midi_event" echo " LSCP runtime max. voices / disk streams support .: $ac_max_voices" echo echo " Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix" Index: Makefile.cvs =================================================================== RCS file: /cvsroot/qsampler/qsampler/Makefile.cvs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.cvs 12 Oct 2007 22:55:48 -0000 1.5 +++ Makefile.cvs 25 Dec 2008 17:06:51 -0000 1.6 @@ -7,5 +7,5 @@ clean: @if [ -f Makefile ]; then make clean; fi || true - @rm -rvf Makefile configure config.* + @rm -rvf Makefile configure config.* .ui .obj .moc @rm -rvf *.cache *.log *.status *.pro *.spec *.desktop |
|
From: Rui N. C. <rn...@us...> - 2008-12-25 17:06:55
|
Update of /cvsroot/qsampler/qsampler/win32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17151/win32 Modified Files: config.h Log Message: - Bumped autoconf stuff to avoid any newer cache warnings. Index: config.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/win32/config.h,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- config.h 22 Dec 2008 18:19:08 -0000 1.51 +++ config.h 25 Dec 2008 17:06:51 -0000 1.52 @@ -1,6 +1,6 @@ #define PACKAGE_NAME "Qsampler" -#define PACKAGE_VERSION "0.2.1.22" +#define PACKAGE_VERSION "0.2.1.23" #define CONFIG_PREFIX "." #define CONFIG_DEBUG 1 |
|
From: Rui N. C. <rn...@us...> - 2008-12-22 18:19:35
|
Update of /cvsroot/qsampler/qsampler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19122 Modified Files: configure.ac Log Message: * bugfix: max voices / streams spinboxes in options dialog were limited to 99 (now maximum is 999999999) * bumped version to 0.2.1.22 Index: configure.ac =================================================================== RCS file: /cvsroot/qsampler/qsampler/configure.ac,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- configure.ac 22 Dec 2008 10:01:23 -0000 1.72 +++ configure.ac 22 Dec 2008 18:19:08 -0000 1.73 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.2.1.21, rn...@rn..., qsampler) +AC_INIT(Qsampler, 0.2.1.22, rn...@rn..., qsampler) AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui) AC_CONFIG_HEADERS(config.h) |
|
From: Rui N. C. <rn...@us...> - 2008-12-22 18:19:14
|
Update of /cvsroot/qsampler/qsampler/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19122/src Modified Files: qsamplerOptionsForm.ui Log Message: * bugfix: max voices / streams spinboxes in options dialog were limited to 99 (now maximum is 999999999) * bumped version to 0.2.1.22 Index: qsamplerOptionsForm.ui =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptionsForm.ui,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- qsamplerOptionsForm.ui 22 Dec 2008 10:01:23 -0000 1.31 +++ qsamplerOptionsForm.ui 22 Dec 2008 18:19:08 -0000 1.32 @@ -27,7 +27,7 @@ <x>0</x> <y>0</y> <width>539</width> - <height>368</height> + <height>422</height> </rect> </property> <property name="windowTitle" > @@ -104,6 +104,14 @@ <number>0</number> </property> <widget class="QWidget" name="ServerTabPage" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>527</width> + <height>352</height> + </rect> + </property> <attribute name="title" > <string>&Server</string> </attribute> @@ -594,6 +602,14 @@ </layout> </widget> <widget class="QWidget" name="TuningTabPage" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>527</width> + <height>352</height> + </rect> + </property> <attribute name="title" > <string>&Tuning</string> </attribute> @@ -643,6 +659,9 @@ <property name="toolTip" > <string>Maximum number of voices</string> </property> + <property name="maximum" > + <number>999999999</number> + </property> </widget> </item> <item rowspan="2" row="0" column="2" > @@ -688,6 +707,9 @@ <property name="toolTip" > <string>Maximum number of disk streams</string> </property> + <property name="maximum" > + <number>999999999</number> + </property> </widget> </item> <item row="2" column="0" colspan="3" > @@ -709,6 +731,14 @@ </layout> </widget> <widget class="QWidget" name="DisplayTabPage" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>800</width> + <height>480</height> + </rect> + </property> <attribute name="title" > <string>&Display</string> </attribute> |
|
From: Rui N. C. <rn...@us...> - 2008-12-22 18:19:14
|
Update of /cvsroot/qsampler/qsampler/win32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19122/win32 Modified Files: config.h Log Message: * bugfix: max voices / streams spinboxes in options dialog were limited to 99 (now maximum is 999999999) * bumped version to 0.2.1.22 Index: config.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/win32/config.h,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- config.h 22 Dec 2008 10:01:23 -0000 1.50 +++ config.h 22 Dec 2008 18:19:08 -0000 1.51 @@ -1,6 +1,6 @@ #define PACKAGE_NAME "Qsampler" -#define PACKAGE_VERSION "0.2.1.21" +#define PACKAGE_VERSION "0.2.1.22" #define CONFIG_PREFIX "." #define CONFIG_DEBUG 1 |
|
From: Rui N. C. <rn...@us...> - 2008-12-22 10:01:58
|
Update of /cvsroot/qsampler/qsampler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5660 Modified Files: ChangeLog configure.ac Log Message: - Added support for runtime max. voices / disk streams setting (accessible from the Options... dialog). Those fine tuning settings will be saved in case the user modified them and automatically restored to the sampler when reconnecting to a sampler the next time. Index: configure.ac =================================================================== RCS file: /cvsroot/qsampler/qsampler/configure.ac,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- configure.ac 20 Dec 2008 23:22:04 -0000 1.71 +++ configure.ac 22 Dec 2008 10:01:23 -0000 1.72 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.2.1.20, rn...@rn..., qsampler) +AC_INIT(Qsampler, 0.2.1.21, rn...@rn..., qsampler) AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui) AC_CONFIG_HEADERS(config.h) Index: ChangeLog =================================================================== RCS file: /cvsroot/qsampler/qsampler/ChangeLog,v retrieving revision 1.142 retrieving revision 1.143 diff -u -d -r1.142 -r1.143 --- ChangeLog 20 Dec 2008 23:22:04 -0000 1.142 +++ ChangeLog 22 Dec 2008 10:01:23 -0000 1.143 @@ -15,18 +15,19 @@ * Fait-divers: desktop menu file touched to openSUSE conventions. -* Due to some trouble with newer Qt >= 4.4 applications regarding font - size configuration, a new global user option is now available to the - rescue: View/Options... /Display/Other/Base font size (default none). +* Due to some trouble with newer Qt >= 4.4 applications regarding + font size configuration, a new global user option is now available + to the rescue: View/Options... /Display/Other/Base font size + (default none). * Attempt to load Qt's own translation support and get rid of the ever warning startup message, unless built in debug mode. (transaction by Guido Scholz, while on qsynth-devel, thanks). -* Only one application instance is now allowed to be up and running, - with immediate but graceful termination upon startup iif an already - running instance is detected, which will see its main widget shown - up automatically (Qt/X11 platform only). +* Only one application instance is now allowed to be up and + running, with immediate but graceful termination upon startup + iif an already running instance is detected, which will see its + main widget shown up automatically (Qt/X11 platform only). * Messages file logging makes its first long overdue appearance, with user configurable settings in View/Options.../Server/Logging. @@ -34,32 +35,33 @@ * Bugfix in sampler channel dialog, driver combo boxes' content were screwed. -* Automatically add & remove channel strips as they were removed e.g. by - other frontends. +* Automatically add & remove channel strips as they were removed + e.g. by other frontends. * Refresh device management dialog when device informations changed, e.g. on changes caused by other frontends (fixes segfault on device changes) -* Implemented MIDI device activity windows, selectable from the "View" - main menu. +* Implemented MIDI device activity windows, selectable from the + "View" main menu. * Implemented MIDI activity indicator on channel strips. * Added FX Sends Dialog to Channel Strips. -* Color pallete fix for the instrument name display in channel strip, - particularly notorious on Mac OS X builds. +* Color pallete fix for the instrument name display in channel + strip, particularly notorious on Mac OS X builds. -* Added dialog when the application exits which lets the user decide - whether to keep the LinuxSampler running or not. +* Added dialog when the application exits which lets the user + decide whether to keep the LinuxSampler running or not. 0.2.1 2007-12-06 Qt4 migration was complete. -* Added recent new support of libgig for retrieving instrument names in a - very fast way. If libgig provides this feature, then the respective - name retrieval setting in qsampler is enabled by default. +* Added recent new support of libgig for retrieving instrument + names in avery fast way. If libgig provides this feature, then + the respective name retrieval setting in qsampler is enabled by + default. * The current selected/activated channel-strip is now visually evident while in the application workspace (highlighting). |
|
From: Rui N. C. <rn...@us...> - 2008-12-22 10:01:54
|
Update of /cvsroot/qsampler/qsampler/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5660/src Modified Files: qsamplerMainForm.cpp qsamplerOptionsForm.ui Log Message: - Added support for runtime max. voices / disk streams setting (accessible from the Options... dialog). Those fine tuning settings will be saved in case the user modified them and automatically restored to the sampler when reconnecting to a sampler the next time. Index: qsamplerOptionsForm.ui =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptionsForm.ui,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- qsamplerOptionsForm.ui 20 Dec 2008 23:22:04 -0000 1.30 +++ qsamplerOptionsForm.ui 22 Dec 2008 10:01:23 -0000 1.31 @@ -26,8 +26,8 @@ <rect> <x>0</x> <y>0</y> - <width>537</width> - <height>422</height> + <width>539</width> + <height>368</height> </rect> </property> <property name="windowTitle" > @@ -104,14 +104,6 @@ <number>0</number> </property> <widget class="QWidget" name="ServerTabPage" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>525</width> - <height>352</height> - </rect> - </property> <attribute name="title" > <string>&Server</string> </attribute> @@ -602,18 +594,10 @@ </layout> </widget> <widget class="QWidget" name="TuningTabPage" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>525</width> - <height>352</height> - </rect> - </property> <attribute name="title" > <string>&Tuning</string> </attribute> - <layout class="QGridLayout" name="gridLayout" > + <layout class="QGridLayout" > <item row="0" column="0" > <widget class="QGroupBox" name="LimitsGroupBox" > <property name="font" > @@ -628,13 +612,7 @@ <property name="flat" > <bool>true</bool> </property> - <layout class="QGridLayout" name="_2" > - <property name="margin" > - <number>8</number> - </property> - <property name="spacing" > - <number>4</number> - </property> + <layout class="QGridLayout" > <item row="0" column="0" > <widget class="QLabel" name="MaxVoicesTextLabel" > <property name="font" > @@ -644,74 +622,97 @@ </font> </property> <property name="text" > - <string>Max. Voices:</string> + <string>Maximum number of voices:</string> </property> </widget> </item> <item row="0" column="1" > <widget class="QSpinBox" name="MaxVoicesSpinBox" > + <property name="minimumSize" > + <size> + <width>60</width> + <height>0</height> + </size> + </property> <property name="font" > <font> <weight>50</weight> <bold>false</bold> </font> </property> + <property name="toolTip" > + <string>Maximum number of voices</string> + </property> </widget> </item> - <item row="1" column="1" > - <widget class="QSpinBox" name="MaxStreamsSpinBox" > + <item rowspan="2" row="0" column="2" > + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>250</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0" > + <widget class="QLabel" name="MaxDiskStreamsTextLabel" > <property name="font" > <font> <weight>50</weight> <bold>false</bold> </font> </property> + <property name="text" > + <string>Maximum number of disk streams:</string> + </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="MaxDiskStreamsTextLabel" > + <item row="1" column="1" > + <widget class="QSpinBox" name="MaxStreamsSpinBox" > + <property name="minimumSize" > + <size> + <width>60</width> + <height>0</height> + </size> + </property> <property name="font" > <font> <weight>50</weight> <bold>false</bold> </font> </property> - <property name="text" > - <string>Max. Disk Streams:</string> + <property name="toolTip" > + <string>Maximum number of disk streams</string> </property> </widget> </item> + <item row="2" column="0" colspan="3" > + <spacer> + <property name="orientation" > + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>20</width> + <height>194</height> + </size> + </property> + </spacer> + </item> </layout> </widget> </item> - <item row="1" column="0" > - <spacer name="verticalSpacer" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>83</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <widget class="QWidget" name="DisplayTabPage" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>525</width> - <height>352</height> - </rect> - </property> <attribute name="title" > <string>&Display</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="ChannelsGroupBox" > <property name="font" > @@ -1201,7 +1202,7 @@ </widget> </item> <item rowspan="3" row="1" column="1" colspan="3" > - <spacer name="horizontalSpacer" > + <spacer> <property name="orientation" > <enum>Qt::Horizontal</enum> </property> Index: qsamplerMainForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerMainForm.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- qsamplerMainForm.cpp 20 Dec 2008 23:22:04 -0000 1.10 +++ qsamplerMainForm.cpp 22 Dec 2008 10:01:23 -0000 1.11 @@ -1810,6 +1810,21 @@ sText += tr("Instrument editing support disabled."); sText += "</font></small><br />"; #endif +#ifndef CONFIG_EVENT_CHANNEL_MIDI + sText += "<small><font color=\"red\">"; + sText += tr("Channel MIDI event support disabled."); + sText += "</font></small><br />"; +#endif +#ifndef CONFIG_EVENT_DEVICE_MIDI + sText += "<small><font color=\"red\">"; + sText += tr("Device MIDI event support disabled."); + sText += "</font></small><br />"; +#endif +#ifndef CONFIG_MAX_VOICES + sText += "<small><font color=\"red\">"; + sText += tr("Runtime max. voices / disk streams support disabled."); + sText += "</font></small><br />"; +#endif sText += "<br />\n"; sText += tr("Using") + ": "; sText += ::lscp_client_package(); |
|
From: Rui N. C. <rn...@us...> - 2008-12-22 10:01:54
|
Update of /cvsroot/qsampler/qsampler/win32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5660/win32 Modified Files: config.h Log Message: - Added support for runtime max. voices / disk streams setting (accessible from the Options... dialog). Those fine tuning settings will be saved in case the user modified them and automatically restored to the sampler when reconnecting to a sampler the next time. Index: config.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/win32/config.h,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- config.h 26 Oct 2008 15:44:14 -0000 1.49 +++ config.h 22 Dec 2008 10:01:23 -0000 1.50 @@ -1,6 +1,6 @@ #define PACKAGE_NAME "Qsampler" -#define PACKAGE_VERSION "0.2.1.19" +#define PACKAGE_VERSION "0.2.1.21" #define CONFIG_PREFIX "." #define CONFIG_DEBUG 1 @@ -22,6 +22,8 @@ #define CONFIG_EVENT_CHANNEL_MIDI 1 #define CONFIG_EVENT_DEVICE_MIDI 1 +#define CONFIG_MAX_VOICES 1 + #undef HAVE_SIGNAL_H |
|
From: Rui N. C. <rn...@us...> - 2008-12-20 23:22:34
|
Update of /cvsroot/qsampler/qsampler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4617 Modified Files: ChangeLog configure.ac qsampler.desktop.in qsampler.spec.in Log Message: - Added support for runtime max. voices / disk streams setting (accessible from the Options... dialog). Those fine tuning settings will be saved in case the user modified them and automatically restored to the sampler when reconnecting to a sampler the next time. Index: configure.ac =================================================================== RCS file: /cvsroot/qsampler/qsampler/configure.ac,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- configure.ac 26 Oct 2008 15:44:14 -0000 1.70 +++ configure.ac 20 Dec 2008 23:22:04 -0000 1.71 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.2.1.19, rn...@rn..., qsampler) +AC_INIT(Qsampler, 0.2.1.20, rn...@rn..., qsampler) AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui) AC_CONFIG_HEADERS(config.h) @@ -260,6 +260,11 @@ AC_DEFINE(CONFIG_EVENT_DEVICE_MIDI, 1, [Define if LSCP DEVICE_MIDI event support is available.]) fi +AC_CHECK_LIB(lscp, lscp_get_voices, [ac_max_voices="yes"], [ac_max_voices="no"]) +if test "x$ac_max_voices" = "xyes"; then + AC_DEFINE(CONFIG_MAX_VOICES, 1, [Define if max. voices / streams is available.]) +fi + # Check for optional libraries. if test "x$ac_libgig" = "xyes"; then AC_CHECK_LIB(gig, main, [ac_libgig="yes"], [ac_libgig="no"]) @@ -343,6 +348,7 @@ fi echo " LSCP channel MIDI event support . . . . . . . . .: $ac_lscp_channel_midi_event" echo " LSCP device MIDI event support . . . . . . . . . .: $ac_lscp_device_midi_event" +echo " LSCP runtime max. voices / disk streams support .: $ac_max_voices" echo echo " Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix" echo Index: ChangeLog =================================================================== RCS file: /cvsroot/qsampler/qsampler/ChangeLog,v retrieving revision 1.141 retrieving revision 1.142 diff -u -d -r1.141 -r1.142 --- ChangeLog 26 Oct 2008 15:44:14 -0000 1.141 +++ ChangeLog 20 Dec 2008 23:22:04 -0000 1.142 @@ -5,6 +5,12 @@ CVS HEAD +* Added support for runtime max. voices / disk streams setting + (accessible from the "Options..." dialog). Those fine tuning + settings will be saved in case the user modified them and + automatically restored to the sampler when reconnecting to + a sampler the next time. + * Grayed/disabled palette color group fix for dark color themes. * Fait-divers: desktop menu file touched to openSUSE conventions. Index: qsampler.spec.in =================================================================== RCS file: /cvsroot/qsampler/qsampler/qsampler.spec.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- qsampler.spec.in 6 Dec 2007 22:48:41 -0000 1.12 +++ qsampler.spec.in 20 Dec 2008 23:22:04 -0000 1.13 @@ -3,7 +3,7 @@ %define release 10 %define prefix @ac_prefix@ -Summary: A LinuxSampler Qt GUI interface. +Summary: A LinuxSampler Qt GUI interface Name: %{name} Version: %{version} Release: %{release} Index: qsampler.desktop.in =================================================================== RCS file: /cvsroot/qsampler/qsampler/qsampler.desktop.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- qsampler.desktop.in 21 Oct 2008 14:47:07 -0000 1.4 +++ qsampler.desktop.in 20 Dec 2008 23:22:04 -0000 1.5 @@ -4,7 +4,7 @@ Comment=Qsampler is a LinuxSampler Qt GUI Interface Exec=@ac_prefix@/bin/qsampler Icon=@ac_prefix@/share/pixmaps/qsampler.png -Categories=Audio;AudioVideo;MIDI;JACK;ALSA;Qt; +Categories=Audio;AudioVideo;JACK;ALSA;Qt; Terminal=false Type=Application X-SuSE-translate=true |
Update of /cvsroot/qsampler/qsampler/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4617/src Modified Files: qsamplerMainForm.cpp qsamplerOptions.cpp qsamplerOptions.h qsamplerOptionsForm.cpp qsamplerOptionsForm.h qsamplerOptionsForm.ui Log Message: - Added support for runtime max. voices / disk streams setting (accessible from the Options... dialog). Those fine tuning settings will be saved in case the user modified them and automatically restored to the sampler when reconnecting to a sampler the next time. Index: qsamplerOptionsForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptionsForm.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- qsamplerOptionsForm.cpp 26 Oct 2008 15:44:14 -0000 1.5 +++ qsamplerOptionsForm.cpp 20 Dec 2008 23:22:04 -0000 1.6 @@ -127,6 +127,12 @@ QObject::connect(m_ui.BaseFontSizeComboBox, SIGNAL(editTextChanged(const QString&)), SLOT(optionsChanged())); + QObject::connect(m_ui.MaxVoicesSpinBox, + SIGNAL(valueChanged(int)), + SLOT(maxVoicesChanged(int))); + QObject::connect(m_ui.MaxStreamsSpinBox, + SIGNAL(valueChanged(int)), + SLOT(maxStreamsChanged(int))); QObject::connect(m_ui.OkPushButton, SIGNAL(clicked()), SLOT(accept())); @@ -220,6 +226,49 @@ m_ui.InstrumentNamesCheckBox->setEnabled(false); #endif + bMaxVoicesModified = bMaxStreamsModified = false; +#ifdef CONFIG_MAX_VOICES + const bool bMaxVoicesSupported = + m_pOptions->getEffectiveMaxVoices() >= 0; + const bool bMaxStreamsSupported = + m_pOptions->getEffectiveMaxStreams() >= 0; + + m_ui.MaxVoicesSpinBox->setEnabled(bMaxVoicesSupported); + m_ui.MaxVoicesSpinBox->setValue(m_pOptions->getMaxVoices()); + if (!bMaxVoicesSupported) + m_ui.MaxVoicesSpinBox->setToolTip( + tr("This parameter is not supported by the current sampler " + "version in use.") + ); + else + m_ui.MaxVoicesSpinBox->setToolTip( + tr("The max. amount of voices the sampler shall process " + "simultaniously.") + ); + + m_ui.MaxStreamsSpinBox->setEnabled(bMaxStreamsSupported); + m_ui.MaxStreamsSpinBox->setValue(m_pOptions->getMaxStreams()); + if (!bMaxStreamsSupported) + m_ui.MaxStreamsSpinBox->setToolTip( + tr("This parameter is not supported by the current sampler " + "version in use.") + ); + else + m_ui.MaxStreamsSpinBox->setToolTip( + tr("The max. amount of disk streams the sampler shall process " + "simultaniously.") + ); +#else + m_ui.MaxVoicesSpinBox->setEnabled(false); + m_ui.MaxStreamsSpinBox->setEnabled(false); + m_ui.MaxVoicesSpinBox->setToolTip( + tr("QSampler was built without support for this parameter.") + ); + m_ui.MaxStreamsSpinBox->setToolTip( + tr("QSampler was built without support for this parameter.") + ); +#endif // CONFIG_MAX_VOICES + // Done. m_iDirtySetup--; stabilizeForm(); @@ -263,6 +312,13 @@ m_iDirtyCount = 0; } + // if the user modified the limits, apply them to the sampler + // (and store it later in qsampler's configuration) + if (bMaxVoicesModified && m_ui.MaxVoicesSpinBox->isEnabled()) + m_pOptions->setMaxVoices(m_ui.MaxVoicesSpinBox->value()); + if (bMaxStreamsModified && m_ui.MaxStreamsSpinBox->isEnabled()) + m_pOptions->setMaxStreams(m_ui.MaxStreamsSpinBox->value()); + // Save combobox history... m_pOptions->saveComboBoxHistory(m_ui.ServerHostComboBox); m_pOptions->saveComboBoxHistory(m_ui.ServerPortComboBox); @@ -404,7 +460,18 @@ optionsChanged(); } -} // namespace QSampler +void OptionsForm::maxVoicesChanged(int /*iMaxVoices*/) +{ + bMaxVoicesModified = true; + optionsChanged(); +} + +void OptionsForm::maxStreamsChanged(int /*iMaxStreams*/) +{ + bMaxStreamsModified = true; + optionsChanged(); +} +} // namespace QSampler // end of qsamplerOptionsForm.cpp Index: qsamplerOptionsForm.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptionsForm.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- qsamplerOptionsForm.h 14 May 2008 15:41:54 -0000 1.3 +++ qsamplerOptionsForm.h 20 Dec 2008 23:22:04 -0000 1.4 @@ -55,6 +55,8 @@ void chooseDisplayFont(); void chooseMessagesFont(); void toggleDisplayEffect(bool bOn); + void maxVoicesChanged(int iMaxVoices); + void maxStreamsChanged(int iMaxStreams); private: @@ -63,6 +65,8 @@ Options* m_pOptions; int m_iDirtySetup; int m_iDirtyCount; + bool bMaxVoicesModified; + bool bMaxStreamsModified; }; } // namespace QSampler Index: qsamplerMainForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerMainForm.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- qsamplerMainForm.cpp 2 Jul 2008 11:23:09 -0000 1.9 +++ qsamplerMainForm.cpp 20 Dec 2008 23:22:04 -0000 1.10 @@ -1620,7 +1620,7 @@ int iOldServerTimeout = m_pOptions->iServerTimeout; bool bOldServerStart = m_pOptions->bServerStart; QString sOldServerCmdLine = m_pOptions->sServerCmdLine; - bool bOldMessagesLog = m_pOptions->bMessagesLog; + bool bOldMessagesLog = m_pOptions->bMessagesLog; QString sOldMessagesLogPath = m_pOptions->sMessagesLogPath; QString sOldDisplayFont = m_pOptions->sDisplayFont; bool bOldDisplayEffect = m_pOptions->bDisplayEffect; @@ -2771,6 +2771,9 @@ } } + // send the current / loaded fine tuning settings to the sampler + m_pOptions->sendFineTuningSettings(); + // Make a new session return newSession(); } Index: qsamplerOptions.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptions.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- qsamplerOptions.h 2 Jul 2008 11:23:09 -0000 1.25 +++ qsamplerOptions.h 20 Dec 2008 23:22:04 -0000 1.26 @@ -114,10 +114,24 @@ void loadComboBoxHistory(QComboBox *pComboBox, int iLimit = 8); void saveComboBoxHistory(QComboBox *pComboBox, int iLimit = 8); + int getMaxVoices(); + int getEffectiveMaxVoices(); + void setMaxVoices(int iMaxVoices); + + int getMaxStreams(); + int getEffectiveMaxStreams(); + void setMaxStreams(int iMaxStreams); + + void sendFineTuningSettings(); + private: // Settings member variables. QSettings m_settings; + + // Tuning + int iMaxVoices; + int iMaxStreams; }; } // namespace QSampler Index: qsamplerOptions.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptions.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- qsamplerOptions.cpp 2 Jul 2008 11:23:09 -0000 1.35 +++ qsamplerOptions.cpp 20 Dec 2008 23:22:04 -0000 1.36 @@ -22,6 +22,7 @@ #include "qsamplerAbout.h" #include "qsamplerOptions.h" +#include "qsamplerMainForm.h" #include <QTextStream> #include <QComboBox> @@ -117,6 +118,12 @@ } m_settings.endGroup(); + // Sampler fine tuning settings. + m_settings.beginGroup("/Tuning"); + iMaxVoices = m_settings.value("/MaxVoices", -1).toInt(); + iMaxStreams = m_settings.value("/MaxStreams", -1).toInt(); + m_settings.endGroup(); + // Last but not least, get the default directories. m_settings.beginGroup("/Default"); sSessionDir = m_settings.value("/SessionDir").toString(); @@ -197,6 +204,14 @@ m_settings.setValue("/File" + QString::number(++iFile), iter.next()); m_settings.endGroup(); + // Sampler fine tuning settings. + m_settings.beginGroup("/Tuning"); + if (iMaxVoices > 0) + m_settings.setValue("/MaxVoices", iMaxVoices); + if (iMaxStreams >= 0) + m_settings.setValue("/MaxStreams", iMaxStreams); + m_settings.endGroup(); + // Default directories. m_settings.beginGroup("/Default"); m_settings.setValue("/SessionDir", sSessionDir); @@ -425,6 +440,99 @@ m_settings.endGroup(); } +int Options::getMaxVoices() { +#ifndef CONFIG_MAX_VOICES + return -1; +#else + if (iMaxVoices > 0) return iMaxVoices; + return getEffectiveMaxVoices(); +#endif // CONFIG_MAX_VOICES +} + +int Options::getEffectiveMaxVoices() { +#ifndef CONFIG_MAX_VOICES + return -1; +#else + MainForm *pMainForm = MainForm::getInstance(); + if (!pMainForm || !pMainForm->client()) + return -1; + + return ::lscp_get_voices(pMainForm->client()); +#endif // CONFIG_MAX_VOICES +} + +void Options::setMaxVoices(int iMaxVoices) { +#ifdef CONFIG_MAX_VOICES + if (iMaxVoices < 1) return; + + MainForm *pMainForm = MainForm::getInstance(); + if (!pMainForm || !pMainForm->client()) + return; + + lscp_status_t result = + ::lscp_set_voices(pMainForm->client(), iMaxVoices); + + if (result != LSCP_OK) { + pMainForm->appendMessagesClient("lscp_set_voices"); + return; + } + + this->iMaxVoices = iMaxVoices; +#endif // CONFIG_MAX_VOICES +} + +int Options::getMaxStreams() { +#ifndef CONFIG_MAX_VOICES + return -1; +#else + if (iMaxStreams > 0) return iMaxStreams; + return getEffectiveMaxStreams(); +#endif // CONFIG_MAX_VOICES +} + +int Options::getEffectiveMaxStreams() { +#ifndef CONFIG_MAX_VOICES + return -1; +#else + MainForm *pMainForm = MainForm::getInstance(); + if (!pMainForm || !pMainForm->client()) + return -1; + + return ::lscp_get_streams(pMainForm->client()); +#endif // CONFIG_MAX_VOICES +} + +void Options::setMaxStreams(int iMaxStreams) { +#ifdef CONFIG_MAX_VOICES + if (iMaxStreams < 0) return; + + MainForm *pMainForm = MainForm::getInstance(); + if (!pMainForm || !pMainForm->client()) + return; + + lscp_status_t result = + ::lscp_set_streams(pMainForm->client(), iMaxStreams); + + if (result != LSCP_OK) { + pMainForm->appendMessagesClient("lscp_set_streams"); + return; + } + + this->iMaxStreams = iMaxStreams; +#endif // CONFIG_MAX_VOICES +} + +void Options::sendFineTuningSettings() { + setMaxVoices(iMaxVoices); + setMaxStreams(iMaxStreams); + + MainForm *pMainForm = MainForm::getInstance(); + if (!pMainForm || !pMainForm->client()) + return; + + pMainForm->appendMessages(QObject::tr("Sent fine tuning settings.")); +} + } // namespace QSampler Index: qsamplerOptionsForm.ui =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptionsForm.ui,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- qsamplerOptionsForm.ui 26 Oct 2008 15:44:14 -0000 1.29 +++ qsamplerOptionsForm.ui 20 Dec 2008 23:22:04 -0000 1.30 @@ -27,7 +27,7 @@ <x>0</x> <y>0</y> <width>537</width> - <height>368</height> + <height>422</height> </rect> </property> <property name="windowTitle" > @@ -108,8 +108,8 @@ <rect> <x>0</x> <y>0</y> - <width>523</width> - <height>301</height> + <width>525</width> + <height>352</height> </rect> </property> <attribute name="title" > @@ -222,10 +222,8 @@ </item> <item row="0" column="1" colspan="2" > <widget class="QComboBox" name="ServerHostComboBox" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -293,9 +291,7 @@ <item row="4" column="1" colspan="4" > <widget class="QComboBox" name="ServerCmdLineComboBox" > <property name="sizePolicy" > - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> + <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -344,9 +340,7 @@ <item row="5" column="1" > <widget class="QSpinBox" name="StartDelaySpinBox" > <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -431,9 +425,7 @@ <item row="1" column="1" > <widget class="QSpinBox" name="ServerTimeoutSpinBox" > <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -535,9 +527,7 @@ <item row="0" column="1" colspan="3" > <widget class="QComboBox" name="MessagesLogPathComboBox" > <property name="sizePolicy" > - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> + <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -611,13 +601,111 @@ </item> </layout> </widget> + <widget class="QWidget" name="TuningTabPage" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>525</width> + <height>352</height> + </rect> + </property> + <attribute name="title" > + <string>&Tuning</string> + </attribute> + <layout class="QGridLayout" name="gridLayout" > + <item row="0" column="0" > + <widget class="QGroupBox" name="LimitsGroupBox" > + <property name="font" > + <font> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="title" > + <string>Limits</string> + </property> + <property name="flat" > + <bool>true</bool> + </property> + <layout class="QGridLayout" name="_2" > + <property name="margin" > + <number>8</number> + </property> + <property name="spacing" > + <number>4</number> + </property> + <item row="0" column="0" > + <widget class="QLabel" name="MaxVoicesTextLabel" > + <property name="font" > + <font> + <weight>50</weight> + <bold>false</bold> + </font> + </property> + <property name="text" > + <string>Max. Voices:</string> + </property> + </widget> + </item> + <item row="0" column="1" > + <widget class="QSpinBox" name="MaxVoicesSpinBox" > + <property name="font" > + <font> + <weight>50</weight> + <bold>false</bold> + </font> + </property> + </widget> + </item> + <item row="1" column="1" > + <widget class="QSpinBox" name="MaxStreamsSpinBox" > + <property name="font" > + <font> + <weight>50</weight> + <bold>false</bold> + </font> + </property> + </widget> + </item> + <item row="1" column="0" > + <widget class="QLabel" name="MaxDiskStreamsTextLabel" > + <property name="font" > + <font> + <weight>50</weight> + <bold>false</bold> + </font> + </property> + <property name="text" > + <string>Max. Disk Streams:</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="0" > + <spacer name="verticalSpacer" > + <property name="orientation" > + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>20</width> + <height>83</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> <widget class="QWidget" name="DisplayTabPage" > <property name="geometry" > <rect> <x>0</x> <y>0</y> - <width>523</width> - <height>301</height> + <width>525</width> + <height>352</height> </rect> </property> <attribute name="title" > @@ -648,9 +736,7 @@ <item row="0" column="0" > <widget class="QLabel" name="DisplayFontTextLabel" > <property name="sizePolicy" > - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>1</vsizetype> + <sizepolicy vsizetype="Minimum" hsizetype="MinimumExpanding" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -778,9 +864,7 @@ <item row="0" column="4" > <widget class="QSpinBox" name="AutoRefreshTimeSpinBox" > <property name="sizePolicy" > - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>0</vsizetype> + <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -814,9 +898,7 @@ <item row="1" column="4" > <widget class="QSpinBox" name="MaxVolumeSpinBox" > <property name="sizePolicy" > - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>0</vsizetype> + <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -890,9 +972,7 @@ <item> <widget class="QLabel" name="MessagesFontTextLabel" > <property name="sizePolicy" > - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>1</vsizetype> + <sizepolicy vsizetype="Minimum" hsizetype="MinimumExpanding" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> |
|
From: Rui N. C. <rn...@us...> - 2008-12-20 23:15:37
|
Update of /cvsroot/qsampler/liblscp/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4077/src Modified Files: client.c Log Message: - Fixed locale related parser bug (fixes #59). - Added new client interface functions, for managing the global limit of maximum voices and disk streams: lscp_get_voices(), lscp_set_voices(), lscp_get_streams(), lscp_set_streams(). Index: client.c =================================================================== RCS file: /cvsroot/qsampler/liblscp/src/client.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- client.c 18 Feb 2008 22:57:22 -0000 1.66 +++ client.c 20 Dec 2008 23:15:31 -0000 1.67 @@ -20,6 +20,7 @@ *****************************************************************************/ +#include <locale.h> #include "common.h" // Default timeout value (in milliseconds). @@ -35,6 +36,41 @@ //------------------------------------------------------------------------- +// General helper functions. + +struct _locale_t { + char numeric[32]; + char ctype[32]; +}; + +// we need to ensure a constant locale setting e.g. for parsing +// floating point numbers with atof(), as the floating point separator +// character varies by the invidual locale settings +static void _save_and_set_c_locale(struct _locale_t* locale) +{ + strncpy(locale->numeric, setlocale(LC_NUMERIC, NULL), 32); + strncpy(locale->ctype, setlocale(LC_CTYPE, NULL), 32); + setlocale(LC_NUMERIC, "C"); + setlocale(LC_CTYPE, "C"); +} + +// restore the original locale setting as nothing happened +static void _restore_locale(struct _locale_t* locale) +{ + setlocale(LC_NUMERIC, locale->numeric); + setlocale(LC_CTYPE, locale->ctype); +} + +// seems the standard atof() function doesnt care much about locale +// runtime modifications, so we use this workaround +static float _atof(const char* txt) { + float f; + sscanf(txt, "%f", &f); // yeah, you're a good boy sscanf() + return f; +} + + +//------------------------------------------------------------------------- // Event service (datagram oriented). static void _lscp_client_evt_proc ( void *pvClient ) @@ -1111,6 +1147,7 @@ const char *pszCrlf = "\r\n"; char *pszToken; char *pch; + struct _locale_t locale; if (pClient == NULL) return NULL; @@ -1123,6 +1160,8 @@ pChannelInfo = &(pClient->channel_info); lscp_channel_info_reset(pChannelInfo); + _save_and_set_c_locale(&locale); + sprintf(szQuery, "GET CHANNEL INFO %d\r\n", iSamplerChannel); if (lscp_client_call(pClient, szQuery, 1) == LSCP_OK) { pszResult = lscp_client_get_result(pClient); @@ -1207,7 +1246,7 @@ else if (strcasecmp(pszToken, "VOLUME") == 0) { pszToken = lscp_strtok(NULL, pszCrlf, &(pch)); if (pszToken) - pChannelInfo->volume = (float) atof(lscp_ltrim(pszToken)); + pChannelInfo->volume = _atof(lscp_ltrim(pszToken)); } else if (strcasecmp(pszToken, "MUTE") == 0) { pszToken = lscp_strtok(NULL, pszCrlf, &(pch)); @@ -1224,6 +1263,8 @@ } else pChannelInfo = NULL; + _restore_locale(&locale); + // Unlock this section up. lscp_mutex_unlock(pClient->mutex); @@ -1638,11 +1679,15 @@ lscp_status_t lscp_set_channel_volume ( lscp_client_t *pClient, int iSamplerChannel, float fVolume ) { char szQuery[LSCP_BUFSIZ]; + struct _locale_t locale; if (iSamplerChannel < 0 || fVolume < 0.0f) return LSCP_FAILED; + _save_and_set_c_locale(&locale); sprintf(szQuery, "SET CHANNEL VOLUME %d %g\r\n", iSamplerChannel, fVolume); + _restore_locale(&locale); + return lscp_client_query(pClient, szQuery); } @@ -1726,7 +1771,7 @@ */ lscp_status_t lscp_reset_sampler ( lscp_client_t *pClient ) { - // Do actual whole sampler reset... + // Do actual whole sampler reset... return lscp_client_query(pClient, "RESET\r\n"); } @@ -1859,6 +1904,7 @@ float lscp_get_volume ( lscp_client_t *pClient ) { float fVolume = 0.0f; + struct _locale_t locale; if (pClient == NULL) return 0.0f; @@ -1866,8 +1912,12 @@ // Lock this section up. lscp_mutex_lock(pClient->mutex); + _save_and_set_c_locale(&locale); + if (lscp_client_call(pClient, "GET VOLUME\r\n", 0) == LSCP_OK) - fVolume = (float) atof(lscp_client_get_result(pClient)); + fVolume = _atof(lscp_client_get_result(pClient)); + + _restore_locale(&locale); // Unlock this section down. lscp_mutex_unlock(pClient->mutex); @@ -1890,14 +1940,141 @@ lscp_status_t lscp_set_volume ( lscp_client_t *pClient, float fVolume ) { char szQuery[LSCP_BUFSIZ]; + struct _locale_t locale; if (fVolume < 0.0f) return LSCP_FAILED; + _save_and_set_c_locale(&locale); sprintf(szQuery, "SET VOLUME %g\r\n", fVolume); + _restore_locale(&locale); + + return lscp_client_query(pClient, szQuery); +} + +/** + * Get global voice limit setting: + * @code + * GET VOICES + * @endcode + * This value reflects the maximum amount of voices a sampler engine + * processes simultaniously before voice stealing kicks in. + * + * @param pClient Pointer to client instance structure. + * + * @returns The current global maximum amount of voices limit or a + * negative value on error (e.g. if sampler doesn't support + * this command). + */ +int lscp_get_voices(lscp_client_t *pClient) +{ + int iVoices = -1; + + if (pClient == NULL) + return -1; + + // Lock this section up. + lscp_mutex_lock(pClient->mutex); + + if (lscp_client_call(pClient, "GET VOICES\r\n", 0) == LSCP_OK) + iVoices = atoi(lscp_client_get_result(pClient)); + + // Unlock this section down. + lscp_mutex_unlock(pClient->mutex); + + return iVoices; +} + +/** + * Setting global voice limit setting: + * @code + * SET VOICES <max-voices> + * @endcode + * This value reflects the maximum amount of voices a sampler engine + * processes simultaniously before voice stealing kicks in. Note that + * this value will be passed to all sampler engine instances, that is + * the total amount of maximum voices on the running system is thus + * @param iMaxVoices multiplied with the current amount of sampler + * engine instances. + * + * @param pClient Pointer to client instance structure. + * @param iMaxVoices Global voice limit setting as integer value larger + * or equal to 1. + * + * @returns LSCP_OK on success, LSCP_FAILED otherwise. + */ +lscp_status_t lscp_set_voices(lscp_client_t *pClient, int iMaxVoices) +{ + char szQuery[LSCP_BUFSIZ]; + + if (iMaxVoices < 1) + return LSCP_FAILED; + + sprintf(szQuery, "SET VOICES %d\r\n", iMaxVoices); return lscp_client_query(pClient, szQuery); } +/** + * Get global disk streams limit setting: + * @code + * GET STREAMS + * @endcode + * This value reflects the maximum amount of disk streams a sampler + * engine processes simultaniously. + * + * @param pClient Pointer to client instance structure. + * + * @returns The current global maximum amount of disk streams limit + * or a negative value on error (e.g. if sampler doesn't + * support this command). + */ +int lscp_get_streams(lscp_client_t *pClient) +{ + int iStreams = -1; + + if (pClient == NULL) + return -1; + + // Lock this section up. + lscp_mutex_lock(pClient->mutex); + + if (lscp_client_call(pClient, "GET STREAMS\r\n", 0) == LSCP_OK) + iStreams = atoi(lscp_client_get_result(pClient)); + + // Unlock this section down. + lscp_mutex_unlock(pClient->mutex); + + return iStreams; +} + +/** + * Setting global disk streams limit setting: + * @code + * SET STREAMS <max-streams> + * @endcode + * This value reflects the maximum amount of dist streams a sampler + * engine instance processes simultaniously. Note that this value will + * be passed to all sampler engine instances, that is the total amount + * of maximum disk streams on the running system is thus + * @param iMaxStreams multiplied with the current amount of sampler + * engine instances. + * + * @param pClient Pointer to client instance structure. + * @param iMaxStreams Global streams limit setting as positive integer + * value (larger or equal to 0). + * + * @returns LSCP_OK on success, LSCP_FAILED otherwise. + */ +lscp_status_t lscp_set_streams(lscp_client_t *pClient, int iMaxStreams) +{ + char szQuery[LSCP_BUFSIZ]; + + if (iMaxStreams < 0) + return LSCP_FAILED; + + sprintf(szQuery, "SET STREAMS %d\r\n", iMaxStreams); + return lscp_client_query(pClient, szQuery); +} /** * Add an effect send to a sampler channel: @@ -1926,7 +2103,7 @@ lscp_mutex_lock(pClient->mutex); sprintf(szQuery, "CREATE FX_SEND %d %d", iSamplerChannel, iMidiController); - + if (pszFxName) sprintf(szQuery + strlen(szQuery), " '%s'", pszFxName); @@ -2058,6 +2235,7 @@ const char *pszCrlf = "\r\n"; char *pszToken; char *pch; + struct _locale_t locale; if (pClient == NULL) return NULL; @@ -2067,6 +2245,8 @@ // Lock this section up. lscp_mutex_lock(pClient->mutex); + _save_and_set_c_locale(&locale); + pFxSendInfo = &(pClient->fxsend_info); lscp_fxsend_info_reset(pFxSendInfo); @@ -2096,13 +2276,15 @@ else if (strcasecmp(pszToken, "LEVEL") == 0) { pszToken = lscp_strtok(NULL, pszCrlf, &(pch)); if (pszToken) - pFxSendInfo->level = (float) atof(lscp_ltrim(pszToken)); + pFxSendInfo->level = _atof(lscp_ltrim(pszToken)); } pszToken = lscp_strtok(NULL, pszSeps, &(pch)); } } else pFxSendInfo = NULL; + _restore_locale(&locale); + // Unlock this section up. lscp_mutex_unlock(pClient->mutex); @@ -2196,11 +2378,15 @@ lscp_status_t lscp_set_fxsend_level ( lscp_client_t *pClient, int iSamplerChannel, int iFxSend, float fLevel ) { char szQuery[LSCP_BUFSIZ]; + struct _locale_t locale; if (iSamplerChannel < 0 || iFxSend < 0 || fLevel < 0.0f) return LSCP_FAILED; + _save_and_set_c_locale(&locale); sprintf(szQuery, "SET FX_SEND LEVEL %d %d %f\r\n", iSamplerChannel, iFxSend, fLevel); + _restore_locale(&locale); + return lscp_client_query(pClient, szQuery); } @@ -2227,7 +2413,7 @@ lscp_mutex_lock(pClient->mutex); strcpy(szQuery, "ADD MIDI_INSTRUMENT_MAP"); - + if (pszMapName) sprintf(szQuery + strlen(szQuery), " '%s'", pszMapName); @@ -2353,7 +2539,7 @@ // Lock this section up. lscp_mutex_lock(pClient->mutex); - + if (pClient->midi_map_name) { free(pClient->midi_map_name); pClient->midi_map_name = NULL; @@ -2417,7 +2603,7 @@ * @param pszFileName Instrument file name. * @param iInstrIndex Instrument index number. * @param fVolume Reflects the master volume of the instrument as - * a positive floating point number, where a value + * a positive floating point number, where a value * less than 1.0 for attenuation, and greater than * 1.0 for amplification. * @param load_mode Instrument load life-time strategy, either @@ -2432,6 +2618,7 @@ lscp_status_t lscp_map_midi_instrument ( lscp_client_t *pClient, lscp_midi_instrument_t *pMidiInstr, const char *pszEngineName, const char *pszFileName, int iInstrIndex, float fVolume, lscp_load_mode_t load_mode, const char *pszName ) { char szQuery[LSCP_BUFSIZ]; + struct _locale_t locale; if (pMidiInstr->map < 0) return LSCP_FAILED; @@ -2445,9 +2632,11 @@ if (fVolume < 0.0f) fVolume = 1.0f; + _save_and_set_c_locale(&locale); sprintf(szQuery, "MAP MIDI_INSTRUMENT %d %d %d %s '%s' %d %g", pMidiInstr->map, pMidiInstr->bank, pMidiInstr->prog, pszEngineName, pszFileName, iInstrIndex, fVolume); + _restore_locale(&locale); switch (load_mode) { case LSCP_LOAD_PERSISTENT: @@ -2604,6 +2793,7 @@ const char *pszCrlf = "\r\n"; char *pszToken; char *pch; + struct _locale_t locale; if (pClient == NULL) return NULL; @@ -2616,7 +2806,9 @@ // Lock this section up. lscp_mutex_lock(pClient->mutex); - + + _save_and_set_c_locale(&locale); + pInstrInfo = &(pClient->midi_instrument_info); lscp_midi_instrument_info_reset(pInstrInfo); @@ -2670,13 +2862,15 @@ else if (strcasecmp(pszToken, "VOLUME") == 0) { pszToken = lscp_strtok(NULL, pszCrlf, &(pch)); if (pszToken) - pInstrInfo->volume = (float) atof(lscp_ltrim(pszToken)); + pInstrInfo->volume = _atof(lscp_ltrim(pszToken)); } pszToken = lscp_strtok(NULL, pszSeps, &(pch)); } } else pInstrInfo = NULL; + _restore_locale(&locale); + // Unlock this section down. lscp_mutex_unlock(pClient->mutex); |
|
From: Rui N. C. <rn...@us...> - 2008-12-20 23:15:36
|
Update of /cvsroot/qsampler/liblscp/lscp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4077/lscp Modified Files: client.h Log Message: - Fixed locale related parser bug (fixes #59). - Added new client interface functions, for managing the global limit of maximum voices and disk streams: lscp_get_voices(), lscp_set_voices(), lscp_get_streams(), lscp_set_streams(). Index: client.h =================================================================== RCS file: /cvsroot/qsampler/liblscp/lscp/client.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- client.h 5 Feb 2008 17:18:09 -0000 1.40 +++ client.h 20 Dec 2008 23:15:31 -0000 1.41 @@ -249,9 +249,15 @@ int lscp_get_total_voice_count (lscp_client_t *pClient); int lscp_get_total_voice_count_max (lscp_client_t *pClient); -float lscp_get_volume (lscp_client_t *pClient ); +float lscp_get_volume (lscp_client_t *pClient); lscp_status_t lscp_set_volume (lscp_client_t *pClient, float fVolume); +int lscp_get_voices (lscp_client_t *pClient); +lscp_status_t lscp_set_voices (lscp_client_t *pClient, int iMaxVoices); + +int lscp_get_streams (lscp_client_t *pClient); +lscp_status_t lscp_set_streams (lscp_client_t *pClient, int iMaxStreams); + //------------------------------------------------------------------------- // Effect sends control functions. |
|
From: Rui N. C. <rn...@us...> - 2008-12-20 23:15:36
|
Update of /cvsroot/qsampler/liblscp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4077 Modified Files: ChangeLog configure.ac Log Message: - Fixed locale related parser bug (fixes #59). - Added new client interface functions, for managing the global limit of maximum voices and disk streams: lscp_get_voices(), lscp_set_voices(), lscp_get_streams(), lscp_set_streams(). Index: configure.ac =================================================================== RCS file: /cvsroot/qsampler/liblscp/configure.ac,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- configure.ac 5 May 2008 17:35:33 -0000 1.19 +++ configure.ac 20 Dec 2008 23:15:31 -0000 1.20 @@ -2,7 +2,7 @@ AC_INIT(src/client.c) AM_CONFIG_HEADER(src/config.h) -AM_INIT_AUTOMAKE(liblscp, 0.5.5.8) +AM_INIT_AUTOMAKE(liblscp, 0.5.5.10) #------------------------------------------------------------------------------------ # Rules for library version information: Index: ChangeLog =================================================================== RCS file: /cvsroot/qsampler/liblscp/ChangeLog,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- ChangeLog 5 May 2008 17:35:32 -0000 1.70 +++ ChangeLog 20 Dec 2008 23:15:31 -0000 1.71 @@ -3,7 +3,14 @@ ChangeLog -CVS HEAD _lscp_device_port_info_query(): take port parameter +CVS HERAD Fixed locale related parser bug (fixes #59). + + Added new client interface functions, for managing + the global limit of maximum voices and disk streams: + lscp_get_voices(), lscp_set_voices(), lscp_get_streams(), + lscp_set_streams(). + + _lscp_device_port_info_query(): take port parameter "NAME" into the result list. Bugfix: _lscp_client_evt_proc() dropped LSCP events. @@ -27,6 +34,16 @@ effect send entities: lscp_set_fxsend_name(); + Added new client interface functions, for managing the + global limit of maximum voices and disk streams: + lscp_get_voices(); + lscp_set_voices(); + lscp_get_streams(); + lscp_set_streams(); + + Bugfix: fixed buggy behavior on different locale + settings (e.g. when parsing floating point numbers). + 0.5.5 2007-10-12 Changed client interface function, for editing instrument, from: lscp_edit_instrument(); @@ -71,7 +88,7 @@ LSCP_EVENT_MIDI_INSTRUMENT_MAP_INFO, LSCP_EVENT_MIDI_INSTRUMENT_COUNT, LSCP_EVENT_MIDI_INSTRUMENT_INFO. - + Updated examples. 0.5.0 2006-12-17 MIDI instrument mapping, second round, according to @@ -160,15 +177,15 @@ as to be more meaningful. Added support for the newest LSCP command: GET SERVER INFO; lscp_get_server_info(). -0.2.8 2005-05-08 [bug #9] Fixed for a LSCP command syntax convention - consistency, regarding the enumeration of available - sampler engines, Audio and MIDI drivers; this has +0.2.8 2005-05-08 [bug #9] Fixed for a LSCP command syntax convention + consistency, regarding the enumeration of available + sampler engines, Audio and MIDI drivers; this has affected the signature of the following functions: lscp_get_available_engines(); lscp_get_available_audio_drivers(); lscp_get_available_midi_drivers(); which are now returning an integer count of engines - and drivers, respectively, while the following + and drivers, respectively, while the following functions are now being introduced: lscp_list_available_engines(); lscp_list_available_audio_drivers(); |
|
From: Rui N. C. <rn...@us...> - 2008-12-20 23:15:36
|
Update of /cvsroot/qsampler/liblscp/win32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4077/win32 Modified Files: Makefile.mingw Log Message: - Fixed locale related parser bug (fixes #59). - Added new client interface functions, for managing the global limit of maximum voices and disk streams: lscp_get_voices(), lscp_set_voices(), lscp_get_streams(), lscp_set_streams(). Index: Makefile.mingw =================================================================== RCS file: /cvsroot/qsampler/liblscp/win32/Makefile.mingw,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.mingw 6 Feb 2008 09:19:11 -0000 1.1 +++ Makefile.mingw 20 Dec 2008 23:15:31 -0000 1.2 @@ -42,7 +42,7 @@ examples: $(LIBNAME).a $(CC) $(CCFLAGS) -c $(EXDIR)/server.c $(CC) $(CCFLAGS) -c $(EXDIR)/parser.c - $(CC) -o example_server $(CCFLAGS) -I$(EXDIR) $(EXDIR)/example_client.c $(LDFLAGS) $(LDLIBS) + $(CC) -o example_client $(CCFLAGS) -I$(EXDIR) $(EXDIR)/example_client.c $(LDFLAGS) $(LDLIBS) $(CC) -o example_server $(CCFLAGS) -I$(EXDIR) $(EXDIR)/example_server.c server.o parser.o $(LDFLAGS) $(LDLIBS) # |
|
From: Rui N. C. <rn...@us...> - 2008-10-26 15:44:21
|
Update of /cvsroot/qsampler/qsampler/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5667/src Modified Files: main.cpp qsamplerOptionsForm.cpp qsamplerOptionsForm.ui Log Message: - Grayed/disabled palette color group fix for dark color themes. Index: qsamplerOptionsForm.ui =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptionsForm.ui,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- qsamplerOptionsForm.ui 2 Jul 2008 11:23:10 -0000 1.28 +++ qsamplerOptionsForm.ui 26 Oct 2008 15:44:14 -0000 1.29 @@ -1230,6 +1230,16 @@ </item> <item> <property name="text" > + <string>6</string> + </property> + </item> + <item> + <property name="text" > + <string>7</string> + </property> + </item> + <item> + <property name="text" > <string>8</string> </property> </item> Index: main.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/main.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- main.cpp 2 Jul 2008 11:23:08 -0000 1.10 +++ main.cpp 26 Oct 2008 15:44:14 -0000 1.11 @@ -32,12 +32,18 @@ #include <QDir> #endif -#if defined(Q_WS_X11) +#if QT_VERSION < 0x040300 +#define lighter(x) light(x) +#define darker(x) dark(x) +#endif + //------------------------------------------------------------------------- -// Single application instance stuff (Qt/X11 only atm.) +// Singleton application instance stuff (Qt/X11 only atm.) // +#if defined(Q_WS_X11) + #include <QX11Info> #include <X11/Xatom.h> @@ -267,9 +273,27 @@ return 2; } + // Dark themes grayed/disabled color group fix... + QPalette pal(app.palette()); + if (pal.base().color().value() < 0x7f) { + pal.setColorGroup(QPalette::Disabled, + pal.windowText().color().darker(), + pal.button(), + pal.light(), + pal.dark(), + pal.mid(), + pal.text().color().darker(), + pal.text().color().lighter(), + pal.base(), + pal.window()); + app.setPalette(pal); + } + // Set default base font... + int iBaseFontSize = app.font().pointSize(); if (options.iBaseFontSize > 0) - app.setFont(QFont(app.font().family(), options.iBaseFontSize)); + iBaseFontSize = options.iBaseFontSize; + app.setFont(QFont(app.font().family(), iBaseFontSize)); // Construct, setup and show the main form. QSampler::MainForm w; Index: qsamplerOptionsForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptionsForm.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- qsamplerOptionsForm.cpp 2 Jul 2008 11:23:10 -0000 1.4 +++ qsamplerOptionsForm.cpp 26 Oct 2008 15:44:14 -0000 1.5 @@ -192,9 +192,9 @@ // Messages font. if (m_pOptions->sMessagesFont.isEmpty() || !font.fromString(m_pOptions->sMessagesFont)) - font = QFont("Fixed", 8); + font = QFont("Monospace", 8); pal = m_ui.MessagesFontTextLabel->palette(); - pal.setColor(QPalette::Background, Qt::white); + pal.setColor(QPalette::Background, pal.base().color()); m_ui.MessagesFontTextLabel->setPalette(pal); m_ui.MessagesFontTextLabel->setFont(font); m_ui.MessagesFontTextLabel->setText(font.family() |
|
From: Rui N. C. <rn...@us...> - 2008-10-26 15:44:21
|
Update of /cvsroot/qsampler/qsampler/win32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5667/win32 Modified Files: config.h Log Message: - Grayed/disabled palette color group fix for dark color themes. Index: config.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/win32/config.h,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- config.h 21 Oct 2008 14:47:07 -0000 1.48 +++ config.h 26 Oct 2008 15:44:14 -0000 1.49 @@ -1,6 +1,6 @@ #define PACKAGE_NAME "Qsampler" -#define PACKAGE_VERSION "0.2.1.18" +#define PACKAGE_VERSION "0.2.1.19" #define CONFIG_PREFIX "." #define CONFIG_DEBUG 1 |
|
From: Rui N. C. <rn...@us...> - 2008-10-26 15:44:19
|
Update of /cvsroot/qsampler/qsampler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5667 Modified Files: ChangeLog configure.ac Log Message: - Grayed/disabled palette color group fix for dark color themes. Index: configure.ac =================================================================== RCS file: /cvsroot/qsampler/qsampler/configure.ac,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- configure.ac 21 Oct 2008 14:47:07 -0000 1.69 +++ configure.ac 26 Oct 2008 15:44:14 -0000 1.70 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.2.1.18, rn...@rn..., qsampler) +AC_INIT(Qsampler, 0.2.1.19, rn...@rn..., qsampler) AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui) AC_CONFIG_HEADERS(config.h) Index: ChangeLog =================================================================== RCS file: /cvsroot/qsampler/qsampler/ChangeLog,v retrieving revision 1.140 retrieving revision 1.141 diff -u -d -r1.140 -r1.141 --- ChangeLog 21 Oct 2008 14:47:07 -0000 1.140 +++ ChangeLog 26 Oct 2008 15:44:14 -0000 1.141 @@ -5,6 +5,8 @@ CVS HEAD +* Grayed/disabled palette color group fix for dark color themes. + * Fait-divers: desktop menu file touched to openSUSE conventions. * Due to some trouble with newer Qt >= 4.4 applications regarding font |
1 message has been excluded from this view by a project administrator.