DISTRHO
/
PawPaw
mirror of https://github.com/DISTRHO/PawPaw
1
0
Fork 0
Code Issues 0 Releases 2 Wiki Activity
Cross-Platform build scripts for audio plugins
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
257 Commits
3 Branches
5.1MB
Tree: 00377f543e
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '00377f543e'
${ noResults }
PawPaw/patches/qjackctl/03_626731e752b4694051b3d447...

761 lines
29KB
Raw Blame History 

  1. From 626731e752b4694051b3d447cebb90116fd37186 Mon Sep 17 00:00:00 2001

  2. From: rncbc <rncbc@rncbc.org>

  3. Date: Sat, 19 Dec 2020 16:25:19 +0000

  4. Subject: [PATCH] - Add Clear preset button to Setup dialog (refactored   from

  5.  an original patch by kmatheussen #113)

  6. 

  7. - Use default values for most preset parameters: sample

  8.   rate, frames/period (aka. buffer-size), periods/buffer,

  9.   realtime priority, port maximum, client timeout, word

  10.   length, wait time, channel maximum (refactored from an

  11.   original patch by kmatheussen #112)

  12. ---

  13.  ChangeLog                 |  12 ++

  14.  src/images/clear1.png     | Bin 0 -> 579 bytes

  15.  src/qjackctl.qrc          |   1 +

  16.  src/qjackctlMainForm.cpp  |  21 ++-

  17.  src/qjackctlSetup.cpp     | 271 ++++++++++++++++++++++++--------------

  18.  src/qjackctlSetup.h       |   7 +

  19.  src/qjackctlSetupForm.cpp |  55 +++++++-

  20.  src/qjackctlSetupForm.h   |   1 +

  21.  src/qjackctlSetupForm.ui  |  57 ++++----

  22.  9 files changed, 274 insertions(+), 151 deletions(-)

  23.  create mode 100644 src/images/clear1.png

  24. 

  25. diff --git a/ChangeLog b/ChangeLog

  26. index d79615ce..2cf233b2 100644

  27. --- a/ChangeLog

  28. +++ b/ChangeLog

  29. @@ -4,6 +4,18 @@ QjackCtl - JACK Audio Connection Kit Qt GUI Interface

  30.  ChangeLog

  31.  

  32.  

  33. +GIT HEAD

  34. +

  35. +- Add Clear preset button to Setup dialog (refactored

  36. +  from an original patch by kmatheussen #113)

  37. +

  38. +- Use default values for most preset parameters: sample

  39. +  rate, frames/period (aka. buffer-size), periods/buffer,

  40. +  realtime priority, port maximum, client timeout, word

  41. +  length, wait time, channel maximum (refactored from an

  42. +  original patch by kmatheussen #112)

  43. +

  44. +

  45.  0.9.0  2020-12-17  A Winter'20 Release.

  46.  

  47.  - List only available backend drivers when JACK D-BUS

  48. diff --git a/src/qjackctl.qrc b/src/qjackctl.qrc

  49. index 55d8d1c7..21303a4e 100644

  50. --- a/src/qjackctl.qrc

  51. +++ b/src/qjackctl.qrc

  52. @@ -38,6 +38,7 @@

  53.    <file>images/asocketi.png</file>

  54.    <file>images/asocketo.png</file>

  55.    <file>images/backward1.png</file>

  56. +  <file>images/clear1.png</file>

  57.    <file>images/client1.png</file>

  58.    <file>images/connect1.png</file>

  59.    <file>images/connections1.png</file>

  60. diff --git a/src/qjackctlMainForm.cpp b/src/qjackctlMainForm.cpp

  61. index ee9afa45..28d916b1 100644

  62. --- a/src/qjackctlMainForm.cpp

  63. +++ b/src/qjackctlMainForm.cpp

  64. @@ -1449,12 +1449,11 @@ void qjackctlMainForm::startJack (void)

  65.  		const QString sPath = QString::fromUtf8(::getenv("PATH"));

  66.  		QStringList paths = sPath.split(chPathSep);

  67.  	#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)

  68. -		paths = paths << QString("%1\\JACK2").arg(getenv("PROGRAMFILES"))

  69. -		              << QString("%1\\JACK2").arg(getenv("PROGRAMFILES(x86)"));

  70. +		paths.append(QString("%1\\JACK2").arg(::getenv("PROGRAMFILES")));

  71. +		paths.append(QString("%1\\JACK2").arg(::getenv("PROGRAMFILES(x86)")));

  72. +	#elif defined(__APPLE__)

  73. +		paths.append("/usr/local/bin/");

  74.  	#endif

  75. -        #if defined(__APPLE__)

  76. -                paths = paths << "/usr/local/bin/";

  77. -        #endif

  78.  		QStringListIterator iter(paths);

  79.  		while (iter.hasNext()) {

  80.  			const QString& sDirectory = iter.next();

  81. @@ -1514,7 +1513,7 @@ void qjackctlMainForm::startJack (void)

  82.  	if (m_preset.iFrames > 0 && !bNet)

  83.  		args.append("-p" + QString::number(m_preset.iFrames));

  84.  	if (bAlsa || bSun || bOss || bFirewire) {

  85. -		if (m_preset.iPeriods > 0)

  86. +		if (m_preset.iPeriods > 1)

  87.  			args.append("-n" + QString::number(m_preset.iPeriods));

  88.  	}

  89.  	if (bAlsa) {

  90. @@ -1570,7 +1569,7 @@ void qjackctlMainForm::startJack (void)

  91.  	else if (bOss || bSun) {

  92.  		if (m_preset.bIgnoreHW)

  93.  			args.append("-b");

  94. -		if (m_preset.iWordLength > 0)

  95. +		if (m_preset.iWordLength > 0 && m_preset.iWordLength != 16)

  96.  			args.append("-w" + QString::number(m_preset.iWordLength));

  97.  		if (!m_preset.sInDevice.isEmpty()  && m_preset.iAudio != QJACKCTL_PLAYBACK)

  98.  			args.append("-C" + formatQuoted(m_preset.sInDevice));

  99. @@ -4365,7 +4364,7 @@ void qjackctlMainForm::setDBusParameters ( const qjackctlPreset& preset )

  100.  	if (bAlsa || bSun || bOss || bFirewire) {

  101.  		setDBusDriverParameter("nperiods",

  102.  			(unsigned int) preset.iPeriods,

  103. -			preset.iPeriods > 0);

  104. +			preset.iPeriods > 1);

  105.  	}

  106.  	if (bAlsa) {

  107.  		setDBusDriverParameter("softmode", preset.bSoftMode);

  108. @@ -4436,7 +4435,7 @@ void qjackctlMainForm::setDBusParameters ( const qjackctlPreset& preset )

  109.  			!sOutDevice.isEmpty() && preset.iAudio != QJACKCTL_CAPTURE);

  110.  		setDBusDriverParameter("inchannels",

  111.  			(unsigned int) preset.iInChannels,

  112. -			preset.iInChannels > 0  && preset.iAudio != QJACKCTL_PLAYBACK);

  113. +			preset.iInChannels > 0 && preset.iAudio != QJACKCTL_PLAYBACK);

  114.  		setDBusDriverParameter("outchannels",

  115.  			(unsigned int) preset.iOutChannels,

  116.  			preset.iOutChannels > 0 && preset.iAudio != QJACKCTL_CAPTURE);

  117. @@ -4444,7 +4443,7 @@ void qjackctlMainForm::setDBusParameters ( const qjackctlPreset& preset )

  118.  	else if (bCoreaudio || bFirewire || bNet) {

  119.  		setDBusDriverParameter("inchannels",

  120.  			(unsigned int) preset.iInChannels,

  121. -			preset.iInChannels > 0  && preset.iAudio != QJACKCTL_PLAYBACK);

  122. +			preset.iInChannels > 0 && preset.iAudio != QJACKCTL_PLAYBACK);

  123.  		setDBusDriverParameter("outchannels",

  124.  			(unsigned int) preset.iOutChannels,

  125.  			preset.iOutChannels > 0 && preset.iAudio != QJACKCTL_CAPTURE);

  126. @@ -4452,7 +4451,7 @@ void qjackctlMainForm::setDBusParameters ( const qjackctlPreset& preset )

  127.  	if (bDummy) {

  128.  		setDBusDriverParameter("wait",

  129.  			(unsigned int) preset.iWait,

  130. -			preset.iWait > 0);

  131. +			preset.iWait > 0 && preset.iWait != 21333);

  132.  	}

  133.  	else

  134.  	if (!bNet) {

  135. diff --git a/src/qjackctlSetup.cpp b/src/qjackctlSetup.cpp

  136. index 8294606c..963cdfff 100644

  137. --- a/src/qjackctlSetup.cpp

  138. +++ b/src/qjackctlSetup.cpp

  139. @@ -40,14 +40,6 @@

  140.  #include <jack/jack.h>

  141.  #endif

  142.  

  143. -#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)

  144. -#define DEFAULT_DRIVER "portaudio"

  145. -#elif defined(__APPLE__)

  146. -#define DEFAULT_DRIVER "coreaudio"

  147. -#else

  148. -#define DEFAULT_DRIVER "alsa"

  149. -#endif

  150. -

  151.  

  152.  // Constructor.

  153.  qjackctlSetup::qjackctlSetup (void)

  154. @@ -370,6 +362,170 @@ bool qjackctlSetup::saveAliases (void)

  155.  }

  156.  

  157.  

  158. +//---------------------------------------------------------------------------

  159. +// Preset struct methods.

  160. +

  161. +void qjackctlPreset::clear (void)

  162. +{

  163. +	sServerPrefix.clear();

  164. +	sServerName  .clear();

  165. +	bRealtime    = true;

  166. +	bSoftMode    = false;

  167. +	bMonitor     = false;

  168. +	bShorts      = false;

  169. +	bNoMemLock   = false;

  170. +	bUnlockMem   = false;

  171. +	bHWMeter     = false;

  172. +	bIgnoreHW    = false;

  173. +	iPriority    = 0;

  174. +	iFrames      = 0;

  175. +	iSampleRate  = 0;

  176. +	iPeriods     = 0;

  177. +	iWordLength  = 0;

  178. +	iWait        = 0;

  179. +	iChan        = 0;

  180. +	sDriver      .clear();

  181. +	sInterface   .clear();

  182. +	iAudio       = 0;

  183. +	iDither      = 0;

  184. +	iTimeout     = 0;

  185. +	sInDevice    .clear();

  186. +	sOutDevice   .clear();

  187. +	iInChannels  = 0;

  188. +	iOutChannels = 0;

  189. +	iInLatency   = 0;

  190. +	iOutLatency  = 0;

  191. +	iStartDelay  = 2;

  192. +	bSync        = false;

  193. +	bVerbose     = false;

  194. +	iPortMax     = 0;

  195. +	sMidiDriver  .clear();

  196. +	sServerSuffix.clear();

  197. +	uClockSource = 0;

  198. +	ucSelfConnectMode = ' ';

  199. +

  200. +	fixup();

  201. +}

  202. +

  203. +

  204. +void qjackctlPreset::load ( QSettings& settings, const QString& sSuffix )

  205. +{

  206. +	settings.beginGroup("/Settings" + sSuffix);

  207. +

  208. +	sServerPrefix = settings.value("/Server",       sServerPrefix).toString();

  209. +	sServerName   = settings.value("/ServerName",   sServerName).toString();

  210. +	bRealtime     = settings.value("/Realtime",     bRealtime).toBool();

  211. +	bSoftMode     = settings.value("/SoftMode",     bSoftMode).toBool();

  212. +	bMonitor      = settings.value("/Monitor",      bMonitor).toBool();

  213. +	bShorts       = settings.value("/Shorts",       bShorts).toBool();

  214. +	bNoMemLock    = settings.value("/NoMemLock",    bNoMemLock).toBool();

  215. +	bUnlockMem    = settings.value("/UnlockMem",    bUnlockMem).toBool();

  216. +	bHWMeter      = settings.value("/HWMeter",      bHWMeter).toBool();

  217. +	bIgnoreHW     = settings.value("/IgnoreHW",     bIgnoreHW).toBool();

  218. +	iPriority     = settings.value("/Priority",     iPriority).toInt();

  219. +	iFrames       = settings.value("/Frames",       iFrames).toInt();

  220. +	iSampleRate   = settings.value("/SampleRate",   iSampleRate).toInt();

  221. +	iPeriods      = settings.value("/Periods",      iPeriods).toInt();

  222. +	iWordLength   = settings.value("/WordLength",   iWordLength).toInt();

  223. +	iWait         = settings.value("/Wait",         iWait).toInt();

  224. +	iChan         = settings.value("/Chan",         iChan).toInt();

  225. +	sDriver       = settings.value("/Driver",       sDriver).toString();

  226. +	sInterface    = settings.value("/Interface",    sInterface).toString();

  227. +	iAudio        = settings.value("/Audio",        iAudio).toInt();

  228. +	iDither       = settings.value("/Dither",       iDither).toInt();

  229. +	iTimeout      = settings.value("/Timeout",      iTimeout).toInt();

  230. +	sInDevice     = settings.value("/InDevice",     sInDevice).toString();

  231. +	sOutDevice    = settings.value("/OutDevice",    sOutDevice).toString();

  232. +	iInChannels   = settings.value("/InChannels",   iInChannels).toInt();

  233. +	iOutChannels  = settings.value("/OutChannels",  iOutChannels).toInt();

  234. +	iInLatency    = settings.value("/InLatency",    iInLatency).toInt();

  235. +	iOutLatency   = settings.value("/OutLatency",   iOutLatency).toInt();

  236. +	iStartDelay   = settings.value("/StartDelay",   iStartDelay).toInt();

  237. +	bSync         = settings.value("/Sync",         bSync).toBool();

  238. +	bVerbose      = settings.value("/Verbose",      bVerbose).toBool();

  239. +	iPortMax      = settings.value("/PortMax",      iPortMax).toInt();

  240. +	sMidiDriver   = settings.value("/MidiDriver",   sMidiDriver).toString();

  241. +	sServerSuffix = settings.value("/ServerSuffix", sServerSuffix).toString();

  242. +	uClockSource  = settings.value("/ClockSource",  uClockSource).toUInt();

  243. +	ucSelfConnectMode = settings.value("/SelfConnectMode", ucSelfConnectMode).value<uchar>();

  244. +

  245. +	settings.endGroup();

  246. +

  247. +	fixup();

  248. +}

  249. +

  250. +void qjackctlPreset::save ( QSettings& settings, const QString& sSuffix )

  251. +{

  252. +	settings.beginGroup("/Settings" + sSuffix);

  253. +

  254. +	settings.setValue("/Server",       sServerPrefix);

  255. +	settings.setValue("/ServerName",   sServerName);

  256. +	settings.setValue("/Realtime",     bRealtime);

  257. +	settings.setValue("/SoftMode",     bSoftMode);

  258. +	settings.setValue("/Monitor",      bMonitor);

  259. +	settings.setValue("/Shorts",       bShorts);

  260. +	settings.setValue("/NoMemLock",    bNoMemLock);

  261. +	settings.setValue("/UnlockMem",    bUnlockMem);

  262. +	settings.setValue("/HWMeter",      bHWMeter);

  263. +	settings.setValue("/IgnoreHW",     bIgnoreHW);

  264. +	settings.setValue("/Priority",     iPriority);

  265. +	settings.setValue("/Frames",       iFrames);

  266. +	settings.setValue("/SampleRate",   iSampleRate);

  267. +	settings.setValue("/Periods",      iPeriods);

  268. +	settings.setValue("/WordLength",   iWordLength);

  269. +	settings.setValue("/Wait",         iWait);

  270. +	settings.setValue("/Chan",         iChan);

  271. +	settings.setValue("/Driver",       sDriver);

  272. +	settings.setValue("/Interface",    sInterface);

  273. +	settings.setValue("/Audio",        iAudio);

  274. +	settings.setValue("/Dither",       iDither);

  275. +	settings.setValue("/Timeout",      iTimeout);

  276. +	settings.setValue("/InDevice",     sInDevice);

  277. +	settings.setValue("/OutDevice",    sOutDevice);

  278. +	settings.setValue("/InChannels",   iInChannels);

  279. +	settings.setValue("/OutChannels",  iOutChannels);

  280. +	settings.setValue("/InLatency",    iInLatency);

  281. +	settings.setValue("/OutLatency",   iOutLatency);

  282. +	settings.setValue("/StartDelay",   iStartDelay);

  283. +	settings.setValue("/Sync",         bSync);

  284. +	settings.setValue("/Verbose",      bVerbose);

  285. +	settings.setValue("/PortMax",      iPortMax);

  286. +	settings.setValue("/MidiDriver",   sMidiDriver);

  287. +	settings.setValue("/ServerSuffix", sServerSuffix);

  288. +	settings.setValue("/ClockSource",  uClockSource);

  289. +	settings.setValue("/SelfConnectMode", ucSelfConnectMode);

  290. +

  291. +	settings.endGroup();

  292. +}

  293. +

  294. +void qjackctlPreset::fixup (void)

  295. +{

  296. +	if (sServerPrefix.isEmpty()) {

  297. +		sServerPrefix = "jackd";

  298. +	#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)

  299. +		sServerPrefix += " -S -X winmme";

  300. +	#endif

  301. +	}

  302. +

  303. +	if (sDriver.isEmpty()) {

  304. +	#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)

  305. +		sDriver =  "portaudio";

  306. +	#elif defined(__APPLE__)

  307. +		sDriver = "coreaudio";

  308. +	#else

  309. +		sDriver = "alsa";

  310. +	#endif

  311. +	}

  312. +

  313. +#ifdef CONFIG_JACK_MIDI

  314. +	if (!sMidiDriver.isEmpty()

  315. +		&& sMidiDriver != "raw"

  316. +		&& sMidiDriver != "seq")

  317. +		sMidiDriver.clear();

  318. +#endif

  319. +}

  320. +

  321. +

  322.  //---------------------------------------------------------------------------

  323.  // Preset management methods.

  324.  

  325. @@ -383,56 +539,7 @@ bool qjackctlSetup::loadPreset ( qjackctlPreset& preset, const QString& sPreset

  326.  			return false;

  327.  	}

  328.  

  329. -	m_settings.beginGroup("/Settings" + sSuffix);

  330. -#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)

  331. -	preset.sServerPrefix = m_settings.value("/Server", "jackd -S -X winmme").toString();

  332. -#else

  333. -	preset.sServerPrefix = m_settings.value("/Server", "jackd").toString();

  334. -#endif

  335. -	preset.sServerName  = m_settings.value("/ServerName").toString();

  336. -	preset.bRealtime    = m_settings.value("/Realtime", true).toBool();

  337. -	preset.bSoftMode    = m_settings.value("/SoftMode", false).toBool();

  338. -	preset.bMonitor     = m_settings.value("/Monitor", false).toBool();

  339. -	preset.bShorts      = m_settings.value("/Shorts", false).toBool();

  340. -	preset.bNoMemLock   = m_settings.value("/NoMemLock", false).toBool();

  341. -	preset.bUnlockMem   = m_settings.value("/UnlockMem", false).toBool();

  342. -	preset.bHWMeter     = m_settings.value("/HWMeter", false).toBool();

  343. -	preset.bIgnoreHW    = m_settings.value("/IgnoreHW", false).toBool();

  344. -	preset.iPriority    = m_settings.value("/Priority", 0).toInt();

  345. -	preset.iFrames      = m_settings.value("/Frames", 1024).toInt();

  346. -	preset.iSampleRate  = m_settings.value("/SampleRate", 48000).toInt();

  347. -	preset.iPeriods     = m_settings.value("/Periods", 2).toInt();

  348. -	preset.iWordLength  = m_settings.value("/WordLength", 16).toInt();

  349. -	preset.iWait        = m_settings.value("/Wait", 21333).toInt();

  350. -	preset.iChan        = m_settings.value("/Chan", 0).toInt();

  351. -	preset.sDriver      = m_settings.value("/Driver", DEFAULT_DRIVER).toString();

  352. -	preset.sInterface   = m_settings.value("/Interface").toString();

  353. -	preset.iAudio       = m_settings.value("/Audio", 0).toInt();

  354. -	preset.iDither      = m_settings.value("/Dither", 0).toInt();

  355. -	preset.iTimeout     = m_settings.value("/Timeout", 500).toInt();

  356. -	preset.sInDevice    = m_settings.value("/InDevice").toString();

  357. -	preset.sOutDevice   = m_settings.value("/OutDevice").toString();

  358. -	preset.iInChannels  = m_settings.value("/InChannels", 0).toInt();

  359. -	preset.iOutChannels = m_settings.value("/OutChannels", 0).toInt();

  360. -	preset.iInLatency   = m_settings.value("/InLatency", 0).toInt();

  361. -	preset.iOutLatency  = m_settings.value("/OutLatency", 0).toInt();

  362. -	preset.iStartDelay  = m_settings.value("/StartDelay", 2).toInt();

  363. -	preset.bSync        = m_settings.value("/Sync", false).toBool();

  364. -	preset.bVerbose     = m_settings.value("/Verbose", false).toBool();

  365. -	preset.iPortMax     = m_settings.value("/PortMax", 256).toInt();

  366. -	preset.sMidiDriver  = m_settings.value("/MidiDriver").toString();

  367. -	preset.sServerSuffix = m_settings.value("/ServerSuffix").toString();

  368. -	preset.uClockSource = m_settings.value("/ClockSource", 0).toUInt();

  369. -	preset.ucSelfConnectMode = m_settings.value("/SelfConnectMode", ' ').value<uchar>();

  370. -	m_settings.endGroup();

  371. -

  372. -#ifdef CONFIG_JACK_MIDI

  373. -	if (!preset.sMidiDriver.isEmpty() &&

  374. -		preset.sMidiDriver != "raw" &&

  375. -		preset.sMidiDriver != "seq")

  376. -		preset.sMidiDriver.clear();

  377. -#endif

  378. -

  379. +	preset.load(m_settings, sSuffix);

  380.  	return true;

  381.  }

  382.  

  383. @@ -446,45 +553,7 @@ bool qjackctlSetup::savePreset ( qjackctlPreset& preset, const QString& sPreset

  384.  			presets.prepend(sPreset);

  385.  	}

  386.  

  387. -	m_settings.beginGroup("/Settings" + sSuffix);

  388. -	m_settings.setValue("/Server",      preset.sServerPrefix);

  389. -	m_settings.setValue("/ServerName",  preset.sServerName);

  390. -	m_settings.setValue("/Realtime",    preset.bRealtime);

  391. -	m_settings.setValue("/SoftMode",    preset.bSoftMode);

  392. -	m_settings.setValue("/Monitor",     preset.bMonitor);

  393. -	m_settings.setValue("/Shorts",      preset.bShorts);

  394. -	m_settings.setValue("/NoMemLock",   preset.bNoMemLock);

  395. -	m_settings.setValue("/UnlockMem",   preset.bUnlockMem);

  396. -	m_settings.setValue("/HWMeter",     preset.bHWMeter);

  397. -	m_settings.setValue("/IgnoreHW",    preset.bIgnoreHW);

  398. -	m_settings.setValue("/Priority",    preset.iPriority);

  399. -	m_settings.setValue("/Frames",      preset.iFrames);

  400. -	m_settings.setValue("/SampleRate",  preset.iSampleRate);

  401. -	m_settings.setValue("/Periods",     preset.iPeriods);

  402. -	m_settings.setValue("/WordLength",  preset.iWordLength);

  403. -	m_settings.setValue("/Wait",        preset.iWait);

  404. -	m_settings.setValue("/Chan",        preset.iChan);

  405. -	m_settings.setValue("/Driver",      preset.sDriver);

  406. -	m_settings.setValue("/Interface",   preset.sInterface);

  407. -	m_settings.setValue("/Audio",       preset.iAudio);

  408. -	m_settings.setValue("/Dither",      preset.iDither);

  409. -	m_settings.setValue("/Timeout",     preset.iTimeout);

  410. -	m_settings.setValue("/InDevice",    preset.sInDevice);

  411. -	m_settings.setValue("/OutDevice",   preset.sOutDevice);

  412. -	m_settings.setValue("/InChannels",  preset.iInChannels);

  413. -	m_settings.setValue("/OutChannels", preset.iOutChannels);

  414. -	m_settings.setValue("/InLatency",   preset.iInLatency);

  415. -	m_settings.setValue("/OutLatency",  preset.iOutLatency);

  416. -	m_settings.setValue("/StartDelay",  preset.iStartDelay);

  417. -	m_settings.setValue("/Sync",        preset.bSync);

  418. -	m_settings.setValue("/Verbose",     preset.bVerbose);

  419. -	m_settings.setValue("/PortMax",     preset.iPortMax);

  420. -	m_settings.setValue("/MidiDriver",  preset.sMidiDriver);

  421. -	m_settings.setValue("/ServerSuffix", preset.sServerSuffix);

  422. -	m_settings.setValue("/ClockSource", preset.uClockSource);

  423. -	m_settings.setValue("/SelfConnectMode", preset.ucSelfConnectMode);

  424. -	m_settings.endGroup();

  425. -

  426. +	preset.save(m_settings, sSuffix);

  427.  	return true;

  428.  }

  429.  

  430. @@ -493,13 +562,15 @@ bool qjackctlSetup::deletePreset ( const QString& sPreset )

  431.  	QString sSuffix;

  432.  	if (sPreset != sDefPresetName && !sPreset.isEmpty()) {

  433.  		sSuffix = '/' + sPreset;

  434. -		int iPreset = presets.indexOf(sPreset);

  435. +		const int iPreset = presets.indexOf(sPreset);

  436.  		if (iPreset < 0)

  437.  			return false;

  438.  		presets.removeAt(iPreset);

  439. -		m_settings.remove("/Settings" + sSuffix);

  440. -		m_settings.remove("/Aliases" + sSuffix);

  441.  	}

  442. +

  443. +	m_settings.remove("/Settings" + sSuffix);

  444. +	m_settings.remove("/Aliases" + sSuffix);

  445. +

  446.  	return true;

  447.  }

  448.  

  449. diff --git a/src/qjackctlSetup.h b/src/qjackctlSetup.h

  450. index 18ca99e9..e03f60d9 100644

  451. --- a/src/qjackctlSetup.h

  452. +++ b/src/qjackctlSetup.h

  453. @@ -47,6 +47,13 @@ class QSplitter;

  454.  // Server settings preset struct.

  455.  struct qjackctlPreset

  456.  {

  457. +	qjackctlPreset() { clear(); }

  458. +

  459. +	void clear();

  460. +	void load(QSettings& settings, const QString& sSuffix);

  461. +	void save(QSettings& settings, const QString& sSuffix);

  462. +	void fixup();

  463. +

  464.  	QString sServerPrefix;

  465.  	QString sServerName;

  466.  	bool    bRealtime;

  467. diff --git a/src/qjackctlSetupForm.cpp b/src/qjackctlSetupForm.cpp

  468. index ee64fa3b..4b934fab 100644

  469. --- a/src/qjackctlSetupForm.cpp

  470. +++ b/src/qjackctlSetupForm.cpp

  471. @@ -95,8 +95,9 @@ qjackctlSetupForm::qjackctlSetupForm ( QWidget *pParent )

  472.  	m_pTimeDisplayButtonGroup->setExclusive(true);

  473.  

  474.  	// Setup clock-source combo-box.

  475. +	const QString& sDefName = tr(g_pszDefName);

  476.  	m_ui.ClockSourceComboBox->clear();

  477. -	m_ui.ClockSourceComboBox->addItem(g_pszDefName, uint(0));

  478. +	m_ui.ClockSourceComboBox->addItem(sDefName, uint(0));

  479.  	m_ui.ClockSourceComboBox->addItem(tr("System"), uint('s'));

  480.  	m_ui.ClockSourceComboBox->addItem(tr("Cycle"),  uint('c'));

  481.  	m_ui.ClockSourceComboBox->addItem(tr("HPET"),   uint('h'));

  482. @@ -157,11 +158,28 @@ qjackctlSetupForm::qjackctlSetupForm ( QWidget *pParent )

  483.  	m_ui.ServerPrefixComboBox->setCompleter(nullptr);

  484.  	m_ui.ServerSuffixComboBox->setCompleter(nullptr);

  485.  

  486. +	m_ui.PrioritySpinBox->setSpecialValueText(sDefName);

  487. +	m_ui.SampleRateComboBox->insertItem(0, sDefName);

  488. +	m_ui.FramesComboBox->insertItem(0, sDefName);

  489. +	m_ui.PeriodsSpinBox->setSpecialValueText(sDefName);

  490. +	m_ui.PortMaxComboBox->insertItem(0, sDefName);

  491. +	m_ui.TimeoutComboBox->insertItem(0, sDefName);

  492. +	m_ui.WaitComboBox->insertItem(0, sDefName);

  493. +	m_ui.WordLengthComboBox->insertItem(0, sDefName);

  494. +	m_ui.ChanSpinBox->setSpecialValueText(sDefName);

  495. +	m_ui.InChannelsSpinBox->setSpecialValueText(sDefName);

  496. +	m_ui.OutChannelsSpinBox->setSpecialValueText(sDefName);

  497. +	m_ui.InLatencySpinBox->setSpecialValueText(sDefName);

  498. +	m_ui.OutLatencySpinBox->setSpecialValueText(sDefName);

  499. +

  500.  	// UI connections...

  501.  

  502.  	QObject::connect(m_ui.PresetComboBox,

  503.  		SIGNAL(editTextChanged(const QString&)),

  504.  		SLOT(changeCurrentPreset(const QString&)));

  505. +	QObject::connect(m_ui.PresetClearPushButton,

  506. +		SIGNAL(clicked()),

  507. +		SLOT(clearCurrentPreset()));

  508.  	QObject::connect(m_ui.PresetSavePushButton,

  509.  		SIGNAL(clicked()),

  510.  		SLOT(saveCurrentPreset()));

  511. @@ -766,15 +784,24 @@ void qjackctlSetupForm::setCurrentPreset ( const qjackctlPreset& preset )

  512.  	m_ui.HWMeterCheckBox->setChecked(preset.bHWMeter);

  513.  	m_ui.IgnoreHWCheckBox->setChecked(preset.bIgnoreHW);

  514.  	m_ui.PrioritySpinBox->setValue(preset.iPriority);

  515. +	const QString& sDefName = tr(g_pszDefName);

  516.  	setComboBoxCurrentText(m_ui.FramesComboBox,

  517. -		QString::number(preset.iFrames));

  518. +		preset.iFrames > 0

  519. +			? QString::number(preset.iFrames)

  520. +			: sDefName);

  521.  	setComboBoxCurrentText(m_ui.SampleRateComboBox,

  522. -		QString::number(preset.iSampleRate));

  523. +		preset.iSampleRate > 0

  524. +			? QString::number(preset.iSampleRate)

  525. +			: sDefName);

  526.  	m_ui.PeriodsSpinBox->setValue(preset.iPeriods);

  527.  	setComboBoxCurrentText(m_ui.WordLengthComboBox,

  528. -		QString::number(preset.iWordLength));

  529. +		preset.iWordLength > 0 && preset.iWordLength != 16

  530. +			? QString::number(preset.iWordLength)

  531. +			: sDefName);

  532.  	setComboBoxCurrentText(m_ui.WaitComboBox,

  533. -	QString::number(preset.iWait));

  534. +		preset.iWait > 0 &&	preset.iWait != 21333

  535. +			? QString::number(preset.iWait)

  536. +			: sDefName);

  537.  	m_ui.ChanSpinBox->setValue(preset.iChan);

  538.  	setComboBoxCurrentText(m_ui.DriverComboBox, preset.sDriver);

  539.  	setComboBoxCurrentText(m_ui.InterfaceComboBox,

  540. @@ -784,7 +811,9 @@ void qjackctlSetupForm::setCurrentPreset ( const qjackctlPreset& preset )

  541.  	m_ui.AudioComboBox->setCurrentIndex(preset.iAudio);

  542.  	m_ui.DitherComboBox->setCurrentIndex(preset.iDither);

  543.  	setComboBoxCurrentText(m_ui.TimeoutComboBox,

  544. -		QString::number(preset.iTimeout));

  545. +		preset.iTimeout > 0 && preset.iTimeout != 500

  546. +			? QString::number(preset.iTimeout)

  547. +			: sDefName);

  548.  	setComboBoxCurrentData(m_ui.ClockSourceComboBox,

  549.  		uint(preset.uClockSource));

  550.  	setComboBoxCurrentText(m_ui.InDeviceComboBox,

  551. @@ -805,7 +834,9 @@ void qjackctlSetupForm::setCurrentPreset ( const qjackctlPreset& preset )

  552.  		QVariant::fromValue<uchar> (preset.ucSelfConnectMode));

  553.  	m_ui.VerboseCheckBox->setChecked(preset.bVerbose);

  554.  	setComboBoxCurrentText(m_ui.PortMaxComboBox,

  555. -		QString::number(preset.iPortMax));

  556. +		preset.iPortMax > 0 && preset.iPortMax != 256

  557. +			? QString::number(preset.iPortMax)

  558. +			: sDefName);

  559.  #ifdef CONFIG_JACK_MIDI

  560.  	setComboBoxCurrentText(m_ui.MidiDriverComboBox,

  561.  		preset.sMidiDriver);

  562. @@ -995,6 +1026,16 @@ void qjackctlSetupForm::changeCurrentPreset ( const QString& sPreset )

  563.  	optionsChanged();

  564.  }

  565.  

  566. +

  567. +void qjackctlSetupForm::clearCurrentPreset (void)

  568. +{

  569. +	// Clear current settings...

  570. +	qjackctlPreset preset;

  571. +	setCurrentPreset(preset);

  572. +	settingsChanged();

  573. +}

  574. +

  575. +

  576.  void qjackctlSetupForm::saveCurrentPreset (void)

  577.  {

  578.  	const QString sPreset = m_ui.PresetComboBox->currentText();

  579. diff --git a/src/qjackctlSetupForm.h b/src/qjackctlSetupForm.h

  580. index 97e1a32f..cbd70dff 100644

  581. --- a/src/qjackctlSetupForm.h

  582. +++ b/src/qjackctlSetupForm.h

  583. @@ -54,6 +54,7 @@ class qjackctlSetupForm : public QDialog

  584.  protected slots:

  585.  

  586.  	void changeCurrentPreset(const QString&);

  587. +	void clearCurrentPreset();

  588.  	void saveCurrentPreset();

  589.  	void deleteCurrentPreset();

  590.  

  591. diff --git a/src/qjackctlSetupForm.ui b/src/qjackctlSetupForm.ui

  592. index e78624b7..bb064f7d 100644

  593. --- a/src/qjackctlSetupForm.ui

  594. +++ b/src/qjackctlSetupForm.ui

  595. @@ -95,6 +95,22 @@

  596.             </item>

  597.            </widget>

  598.           </item>

  599. +         <item>

  600. +          <widget class="QPushButton" name="PresetClearPushButton">

  601. +           <property name="toolTip">

  602. +            <string>Clear settings of current preset name</string>

  603. +           </property>

  604. +           <property name="text">

  605. +            <string>Clea&amp;r</string>

  606. +           </property>

  607. +           <property name="icon">

  608. +            <iconset resource="qjackctl.qrc">:/images/clear1.png</iconset>

  609. +           </property>

  610. +           <property name="autoDefault">

  611. +            <bool>false</bool>

  612. +           </property>

  613. +          </widget>

  614. +         </item>

  615.           <item>

  616.            <widget class="QPushButton" name="PresetSavePushButton">

  617.             <property name="toolTip">

  618. @@ -597,11 +613,14 @@

  619.                  <string>Number of periods in the hardware buffer</string>

  620.                 </property>

  621.                 <property name="minimum">

  622. -                <number>2</number>

  623. +                <number>1</number>

  624.                 </property>

  625.                 <property name="maximum">

  626.                  <number>999</number>

  627.                 </property>

  628. +               <property name="value">

  629. +                <number>1</number>

  630. +               </property>

  631.                </widget>

  632.               </item>

  633.              </layout>

  634. @@ -1064,9 +1083,6 @@

  635.                 <property name="toolTip">

  636.                  <string>Scheduler priority when running realtime</string>

  637.                 </property>

  638. -               <property name="specialValueText">

  639. -                <string>(default)</string>

  640. -               </property>

  641.                 <property name="singleStep">

  642.                  <number>1</number>

  643.                 </property>

  644. @@ -1074,7 +1090,7 @@

  645.                  <number>5</number>

  646.                 </property>

  647.                 <property name="maximum">

  648. -                <number>99</number>

  649. +                <number>95</number>

  650.                 </property>

  651.                </widget>

  652.               </item>

  653. @@ -1108,9 +1124,6 @@

  654.                   <bold>false</bold>

  655.                  </font>

  656.                 </property>

  657. -               <property name="acceptDrops">

  658. -                <bool>false</bool>

  659. -               </property>

  660.                 <property name="toolTip">

  661.                  <string>Word length</string>

  662.                 </property>

  663. @@ -1165,9 +1178,6 @@

  664.                   <bold>false</bold>

  665.                  </font>

  666.                 </property>

  667. -               <property name="acceptDrops">

  668. -                <bool>false</bool>

  669. -               </property>

  670.                 <property name="toolTip">

  671.                  <string>Number of microseconds to wait between engine processes (dummy)</string>

  672.                 </property>

  673. @@ -1217,9 +1227,6 @@

  674.                 <property name="toolTip">

  675.                  <string>Maximum number of audio channels to allocate</string>

  676.                 </property>

  677. -               <property name="specialValueText">

  678. -                <string>(default)</string>

  679. -               </property>

  680.                 <property name="maximum">

  681.                  <number>999</number>

  682.                 </property>

  683. @@ -1268,7 +1275,7 @@

  684.                  <bool>true</bool>

  685.                 </property>

  686.                 <property name="currentIndex">

  687. -                <number>1</number>

  688. +				<number>0</number>

  689.                 </property>

  690.                 <item>

  691.                  <property name="text">

  692. @@ -1330,7 +1337,7 @@

  693.                  <bool>true</bool>

  694.                 </property>

  695.                 <property name="currentIndex">

  696. -                <number>1</number>

  697. +				<number>0</number>

  698.                 </property>

  699.                 <item>

  700.                  <property name="text">

  701. @@ -1357,11 +1364,6 @@

  702.                   <string>5000</string>

  703.                  </property>

  704.                 </item>

  705. -               <item>

  706. -                <property name="text">

  707. -                 <string>10000</string>

  708. -                </property>

  709. -               </item>

  710.                </widget>

  711.               </item>

  712.               <item row="6" column="0">

  713. @@ -1710,9 +1712,6 @@

  714.                 <property name="toolTip">

  715.                  <string>Maximum input audio hardware channels to allocate</string>

  716.                 </property>

  717. -               <property name="specialValueText">

  718. -                <string>(default)</string>

  719. -               </property>

  720.                 <property name="maximum">

  721.                  <number>999</number>

  722.                 </property>

  723. @@ -1741,9 +1740,6 @@

  724.                 <property name="toolTip">

  725.                  <string>Maximum output audio hardware channels to allocate</string>

  726.                 </property>

  727. -               <property name="specialValueText">

  728. -                <string>(default)</string>

  729. -               </property>

  730.                 <property name="maximum">

  731.                  <number>999</number>

  732.                 </property>

  733. @@ -1794,9 +1790,6 @@

  734.                 <property name="toolTip">

  735.                  <string>External input latency (frames)</string>

  736.                 </property>

  737. -               <property name="specialValueText">

  738. -                <string>(default)</string>

  739. -               </property>

  740.                 <property name="maximum">

  741.                  <number>9999999</number>

  742.                 </property>

  743. @@ -1825,9 +1818,6 @@

  744.                 <property name="toolTip">

  745.                  <string>External output latency (frames)</string>

  746.                 </property>

  747. -               <property name="specialValueText">

  748. -                <string>(default)</string>

  749. -               </property>

  750.                 <property name="maximum">

  751.                  <number>9999999</number>

  752.                 </property>

  753. @@ -4209,6 +4199,7 @@

  754.   <tabstops>

  755.    <tabstop>SetupTabWidget</tabstop>

  756.    <tabstop>PresetComboBox</tabstop>

  757. +  <tabstop>PresetClearPushButton</tabstop>

  758.    <tabstop>PresetSavePushButton</tabstop>

  759.    <tabstop>PresetDeletePushButton</tabstop>

  760.    <tabstop>SettingsTabWidget</tabstop>