--- qsampler/trunk/src/qsamplerOptions.cpp 2008/12/07 13:58:16 1803 +++ qsampler/trunk/src/qsamplerOptions.cpp 2015/01/18 20:25:22 2712 @@ -1,7 +1,7 @@ // qsamplerOptions.cpp // /**************************************************************************** - Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2014, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or @@ -44,6 +44,20 @@ Options::Options (void) : m_settings(QSAMPLER_DOMAIN, QSAMPLER_TITLE) { + loadOptions(); +} + + +// Default Destructor. +Options::~Options (void) +{ + saveOptions(); +} + + +// Explicit load method. +void Options::loadOptions (void) +{ // Begin into general options group. m_settings.beginGroup("/Options"); @@ -51,18 +65,18 @@ m_settings.beginGroup("/Server"); sServerHost = m_settings.value("/ServerHost", "localhost").toString(); iServerPort = m_settings.value("/ServerPort", 8888).toInt(); - #if defined(__APPLE__) // Toshi Nagata 20080105 +#if defined(__APPLE__) // Toshi Nagata 20080105 // TODO: Should this be a configure option? iServerTimeout = m_settings.value("/ServerTimeout", 10000).toInt(); - #else +#else iServerTimeout = m_settings.value("/ServerTimeout", 1000).toInt(); - #endif +#endif bServerStart = m_settings.value("/ServerStart", true).toBool(); - #if defined(__APPLE__) // Toshi Nagata 20080113 - sServerCmdLine = m_settings.value("/ServerCmdLine", "linuxsampler.starter").toString(); - #else +#if defined(__APPLE__) + sServerCmdLine = m_settings.value("/ServerCmdLine", "/usr/local/bin/linuxsampler").toString(); +#else sServerCmdLine = m_settings.value("/ServerCmdLine", "linuxsampler").toString(); - #endif +#endif iStartDelay = m_settings.value("/StartDelay", 3).toInt(); m_settings.endGroup(); @@ -90,7 +104,7 @@ iBaseFontSize = m_settings.value("/BaseFontSize", 0).toInt(); // if libgig provides a fast way to retrieve instrument names even for large // .gig files, then we enable this feature by default -#if HAVE_LIBGIG_SETAUTOLOAD +#ifdef CONFIG_LIBGIG_SETAUTOLOAD bInstrumentNames = m_settings.value("/InstrumentNames", true).toBool(); #else bInstrumentNames = m_settings.value("/InstrumentNames", false).toBool(); @@ -140,8 +154,8 @@ } -// Default Destructor. -Options::~Options (void) +// Explicit save method. +void Options::saveOptions (void) { // Make program version available in the future. m_settings.beginGroup("/Program"); @@ -225,8 +239,12 @@ m_settings.setValue("/Volume", iVolume); m_settings.setValue("/Loadmode", iLoadMode); m_settings.endGroup(); + + // Save/commit to disk. + m_settings.sync(); } + //------------------------------------------------------------------------- // Settings accessor. // @@ -242,15 +260,15 @@ // // Help about command line options. -void Options::print_usage ( const char *arg0 ) +void Options::print_usage ( const QString& arg0 ) { QTextStream out(stderr); out << QObject::tr("Usage: %1 [options] [session-file]\n\n" QSAMPLER_TITLE " - " QSAMPLER_SUBTITLE "\n\n" "Options:\n\n" " -s, --start\n\tStart linuxsampler server locally\n\n" - " -h, --hostname\n\tSpecify linuxsampler server hostname\n\n" - " -p, --port\n\tSpecify linuxsampler server port number\n\n" + " -h, --hostname\n\tSpecify linuxsampler server hostname (default = localhost)\n\n" + " -p, --port\n\tSpecify linuxsampler server port number (default = 8888)\n\n" " -?, --help\n\tShow help about command line options\n\n" " -v, --version\n\tShow version information\n\n") .arg(arg0); @@ -258,37 +276,41 @@ // Parse command line arguments into m_settings. -bool Options::parse_args ( int argc, char **argv ) +bool Options::parse_args ( const QStringList& args ) { QTextStream out(stderr); const QString sEol = "\n\n"; int iCmdArgs = 0; + const int argc = args.count(); for (int i = 1; i < argc; i++) { if (iCmdArgs > 0) { sSessionFile += " "; - sSessionFile += argv[i]; + sSessionFile += args.at(i); iCmdArgs++; continue; } - QString sArg = argv[i]; + QString sArg = args.at(i); QString sVal = QString::null; - int iEqual = sArg.indexOf("="); + const int iEqual = sArg.indexOf("="); if (iEqual >= 0) { sVal = sArg.right(sArg.length() - iEqual - 1); sArg = sArg.left(iEqual); } - else if (i < argc) - sVal = argv[i + 1]; + else if (i < argc - 1) { + sVal = args.at(i + 1); + if (sVal[0] == '-') + sVal.clear(); + } if (sArg == "-s" || sArg == "--start") { bServerStart = true; } else if (sArg == "-h" || sArg == "--hostname") { if (sVal.isNull()) { - out << QObject::tr("Option -h requires an argument (hostname).") + sEol; + out << QObject::tr("Option -h requires an argument (host).") + sEol; return false; } sServerHost = sVal; @@ -305,16 +327,16 @@ i++; } else if (sArg == "-?" || sArg == "--help") { - print_usage(argv[0]); + print_usage(args.at(0)); return false; } else if (sArg == "-v" || sArg == "--version") { out << QObject::tr("Qt: %1\n").arg(qVersion()); -#ifdef CONFIG_LIBGIG + #ifdef CONFIG_LIBGIG out << QString("%1: %2\n") .arg(gig::libraryName().c_str()) .arg(gig::libraryVersion().c_str()); -#endif + #endif out << QString("%1: %2\n") .arg(::lscp_client_package()) .arg(::lscp_client_version()); @@ -337,48 +359,47 @@ //--------------------------------------------------------------------------- // Widget geometry persistence helper methods. -void Options::loadWidgetGeometry ( QWidget *pWidget ) +void Options::loadWidgetGeometry ( QWidget *pWidget, bool bVisible ) { // Try to restore old form window positioning. if (pWidget) { - QPoint fpos; - QSize fsize; - bool bVisible; + QPoint wpos; + QSize wsize; m_settings.beginGroup("/Geometry/" + pWidget->objectName()); - fpos.setX(m_settings.value("/x", -1).toInt()); - fpos.setY(m_settings.value("/y", -1).toInt()); - fsize.setWidth(m_settings.value("/width", -1).toInt()); - fsize.setHeight(m_settings.value("/height", -1).toInt()); - bVisible = m_settings.value("/visible", false).toBool(); + wpos.setX(m_settings.value("/x", -1).toInt()); + wpos.setY(m_settings.value("/y", -1).toInt()); + wsize.setWidth(m_settings.value("/width", -1).toInt()); + wsize.setHeight(m_settings.value("/height", -1).toInt()); + if (!bVisible) bVisible = m_settings.value("/visible", false).toBool(); m_settings.endGroup(); - if (fpos.x() > 0 && fpos.y() > 0) - pWidget->move(fpos); - if (fsize.width() > 0 && fsize.height() > 0) - pWidget->resize(fsize); - else - pWidget->adjustSize(); + if (wpos.x() > 0 && wpos.y() > 0) + pWidget->move(wpos); + if (wsize.width() > 0 && wsize.height() > 0) + pWidget->resize(wsize); + // else + // pWidget->adjustSize(); if (bVisible) pWidget->show(); - else - pWidget->hide(); + // else + // pWidget->hide(); } } -void Options::saveWidgetGeometry ( QWidget *pWidget ) +void Options::saveWidgetGeometry ( QWidget *pWidget, bool bVisible ) { // Try to save form window position... // (due to X11 window managers ideossincrasies, we better // only save the form geometry while its up and visible) if (pWidget) { m_settings.beginGroup("/Geometry/" + pWidget->objectName()); - bool bVisible = pWidget->isVisible(); - const QPoint& fpos = pWidget->pos(); - const QSize& fsize = pWidget->size(); - m_settings.setValue("/x", fpos.x()); - m_settings.setValue("/y", fpos.y()); - m_settings.setValue("/width", fsize.width()); - m_settings.setValue("/height", fsize.height()); + const QPoint& wpos = pWidget->pos(); + const QSize& wsize = pWidget->size(); + if (!bVisible) bVisible = pWidget->isVisible(); + m_settings.setValue("/x", wpos.x()); + m_settings.setValue("/y", wpos.y()); + m_settings.setValue("/width", wsize.width()); + m_settings.setValue("/height", wsize.height()); m_settings.setValue("/visible", bVisible); m_settings.endGroup(); }