added bodhran instrument icon, created by bomm (Ticket #131)

ChangeLog

@@ -13,6 +13,8 @@
 
   * added -v/--version command line argument to output version information (Ticket #121)
 
+  * added bodhran instrument icon, created by bomm (Ticket #131)
+
   * bug fix: if names given with the -o option were too long, the server registration failed (Ticket #91)
 
   * bug fix: audio level changes if Buffer Delay is changed (Ticket #106)
@@ -20,14 +22,14 @@
   * bug fix: do not reset fader level meters if number of clients change
 
 
-TODO sometimes I cannot see the central server in the server list
-
-TODO improve audio drop out behaviour with OPUS64 by tuning the coding rate (it seems that for some coding rates we get loud artifacts on audio drop outs whereas for slightly different rates the behavior is much more pleasent), maybe test with OPUS complexity settings, quality settings, etc to improve PLC
-
 TODO improve input channel mapping and introduce input/output gains with overrange to amplification (separate dialog, replace Pan, etc.)
 
 TODO support internationalization
 
+TODO sometimes I cannot see the central server in the server list
+
+TODO improve audio drop out behaviour with OPUS64 by tuning the coding rate (it seems that for some coding rates we get loud artifacts on audio drop outs whereas for slightly different rates the behavior is much more pleasent), maybe test with OPUS complexity settings, quality settings, etc to improve PLC
+
 TODO try to find a way to catch Windows exceptions in case a 64 bit Jamulus tries to load a 32 bit Jack Audio ASIO dll
 
 

Jamulus.pro

@@ -14,7 +14,8 @@ QT += widgets \
     network \
     xml
 
-#TRANSLATIONS = src/res/translation_de.ts
+#TRANSLATIONS = src/res/translation_de_DE.ts \
+#    src/res/translation_fr_FR.ts
 
 INCLUDEPATH += src
 
@@ -521,33 +522,35 @@ DISTFILES += ChangeLog \
     src/res/VRLEDRedSmall.png \
     src/res/VRLEDYellow.png \
     src/res/VRLEDYellowSmall.png \
-    src/res/instraccordeon.png \
-    src/res/instraguitar.png \
-    src/res/instrbassguitar.png \
-    src/res/instrcello.png \
-    src/res/instrclarinet.png \
-    src/res/instrdjembe.png \
-    src/res/instrdoublebass.png \
-    src/res/instrdrumset.png \
-    src/res/instreguitar.png \
-    src/res/instrflute.png \
-    src/res/instrfrenchhorn.png \
-    src/res/instrgrandpiano.png \
-    src/res/instrharmonica.png \
-    src/res/instrkeyboard.png \
-    src/res/instrlistener.png \
-    src/res/instrmicrophone.png \
-    src/res/instrnone.png \
-    src/res/instrrecorder.png \
-    src/res/instrsaxophone.png \
-    src/res/instrstreamer.png \
-    src/res/instrsynthesizer.png \
-    src/res/instrtrombone.png \
-    src/res/instrtrumpet.png \
-    src/res/instrtuba.png \
-    src/res/instrviolin.png \
-    src/res/instrvocal.png \
-    src/res/instrguitarvocal.png \
+    src/res/instruments/instraccordeon.png \
+    src/res/instruments/instraguitar.png \
+    src/res/instruments/instrbassguitar.png \
+    src/res/instruments/instrcello.png \
+    src/res/instruments/instrclarinet.png \
+    src/res/instruments/instrdjembe.png \
+    src/res/instruments/instrdoublebass.png \
+    src/res/instruments/instrdrumset.png \
+    src/res/instruments/instreguitar.png \
+    src/res/instruments/instrflute.png \
+    src/res/instruments/instrfrenchhorn.png \
+    src/res/instruments/instrgrandpiano.png \
+    src/res/instruments/instrharmonica.png \
+    src/res/instruments/instrkeyboard.png \
+    src/res/instruments/instrlistener.png \
+    src/res/instruments/instrmicrophone.png \
+    src/res/instruments/instrnone.png \
+    src/res/instruments/instrrecorder.png \
+    src/res/instruments/instrsaxophone.png \
+    src/res/instruments/instrstreamer.png \
+    src/res/instruments/instrsynthesizer.png \
+    src/res/instruments/instrtrombone.png \
+    src/res/instruments/instrtrumpet.png \
+    src/res/instruments/instrtuba.png \
+    src/res/instruments/instrviolin.png \
+    src/res/instruments/instrvocal.png \
+    src/res/instruments/instrguitarvocal.png \
+    src/res/instruments/bodhran.svg \
+    src/res/instruments/bodhran.png \
     src/res/flags/flagnone.png \
     src/res/flags/ad.png \
     src/res/flags/ae.png \

src/resources.qrc

@@ -21,33 +21,34 @@
         <file>res/mixerboardbackground.png</file>
     </qresource>
     <qresource prefix="/png/instr">
-        <file>res/instrnone.png</file>
-        <file>res/instrbassguitar.png</file>
-        <file>res/instrclarinet.png</file>
-        <file>res/instrdrumset.png</file>
-        <file>res/instreguitar.png</file>
-        <file>res/instrsaxophone.png</file>
-        <file>res/instrtrumpet.png</file>
-        <file>res/instrmicrophone.png</file>
-        <file>res/instrkeyboard.png</file>
-        <file>res/instrviolin.png</file>
-        <file>res/instraguitar.png</file>
-        <file>res/instrflute.png</file>
-        <file>res/instraccordeon.png</file>
-        <file>res/instrcello.png</file>
-        <file>res/instrtrombone.png</file>
-        <file>res/instrfrenchhorn.png</file>
-        <file>res/instrtuba.png</file>
-        <file>res/instrdoublebass.png</file>
-        <file>res/instrgrandpiano.png</file>
-        <file>res/instrsynthesizer.png</file>
-        <file>res/instrvocal.png</file>
-        <file>res/instrdjembe.png</file>
-        <file>res/instrharmonica.png</file>
-        <file>res/instrrecorder.png</file>
-        <file>res/instrlistener.png</file>
-        <file>res/instrstreamer.png</file>
-        <file>res/instrguitarvocal.png</file>
+        <file>res/instruments/instrnone.png</file>
+        <file>res/instruments/instrbassguitar.png</file>
+        <file>res/instruments/instrclarinet.png</file>
+        <file>res/instruments/instrdrumset.png</file>
+        <file>res/instruments/instreguitar.png</file>
+        <file>res/instruments/instrsaxophone.png</file>
+        <file>res/instruments/instrtrumpet.png</file>
+        <file>res/instruments/instrmicrophone.png</file>
+        <file>res/instruments/instrkeyboard.png</file>
+        <file>res/instruments/instrviolin.png</file>
+        <file>res/instruments/instraguitar.png</file>
+        <file>res/instruments/instrflute.png</file>
+        <file>res/instruments/instraccordeon.png</file>
+        <file>res/instruments/instrcello.png</file>
+        <file>res/instruments/instrtrombone.png</file>
+        <file>res/instruments/instrfrenchhorn.png</file>
+        <file>res/instruments/instrtuba.png</file>
+        <file>res/instruments/instrdoublebass.png</file>
+        <file>res/instruments/instrgrandpiano.png</file>
+        <file>res/instruments/instrsynthesizer.png</file>
+        <file>res/instruments/instrvocal.png</file>
+        <file>res/instruments/instrdjembe.png</file>
+        <file>res/instruments/instrharmonica.png</file>
+        <file>res/instruments/instrrecorder.png</file>
+        <file>res/instruments/instrlistener.png</file>
+        <file>res/instruments/instrstreamer.png</file>
+        <file>res/instruments/instrguitarvocal.png</file>
+        <file>res/instruments/bodhran.png</file>
     </qresource>
     <qresource prefix="/png/main">
         <file>res/fronticon.png</file>

src/util.cpp

@@ -935,33 +935,34 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
         // instrument picture data base initialization
         // NOTE: Do not change the order of any instrument in the future!
         // NOTE: The very first entry is the "not used" element per definition.
-        vecDataBase.Add ( CInstPictProps ( "None", ":/png/instr/res/instrnone.png", IC_OTHER_INSTRUMENT ) ); // special first element
-        vecDataBase.Add ( CInstPictProps ( "Drum Set", ":/png/instr/res/instrdrumset.png", IC_PERCUSSION_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Djembe", ":/png/instr/res/instrdjembe.png", IC_PERCUSSION_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Electric Guitar", ":/png/instr/res/instreguitar.png", IC_PLUCKING_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Acoustic Guitar", ":/png/instr/res/instraguitar.png", IC_PLUCKING_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Bass Guitar", ":/png/instr/res/instrbassguitar.png", IC_PLUCKING_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Keyboard", ":/png/instr/res/instrkeyboard.png", IC_KEYBOARD_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Synthesizer", ":/png/instr/res/instrsynthesizer.png", IC_KEYBOARD_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Grand Piano", ":/png/instr/res/instrgrandpiano.png", IC_KEYBOARD_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Accordion", ":/png/instr/res/instraccordeon.png", IC_KEYBOARD_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Vocal", ":/png/instr/res/instrvocal.png", IC_OTHER_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Microphone", ":/png/instr/res/instrmicrophone.png", IC_OTHER_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Harmonica", ":/png/instr/res/instrharmonica.png", IC_WIND_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Trumpet", ":/png/instr/res/instrtrumpet.png", IC_WIND_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Trombone", ":/png/instr/res/instrtrombone.png", IC_WIND_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "French Horn", ":/png/instr/res/instrfrenchhorn.png", IC_WIND_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Tuba", ":/png/instr/res/instrtuba.png", IC_WIND_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Saxophone", ":/png/instr/res/instrsaxophone.png", IC_WIND_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Clarinet", ":/png/instr/res/instrclarinet.png", IC_WIND_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Flute", ":/png/instr/res/instrflute.png", IC_WIND_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Violin", ":/png/instr/res/instrviolin.png", IC_STRING_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Cello", ":/png/instr/res/instrcello.png", IC_STRING_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Double Bass", ":/png/instr/res/instrdoublebass.png", IC_STRING_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Recorder", ":/png/instr/res/instrrecorder.png", IC_OTHER_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Streamer", ":/png/instr/res/instrstreamer.png", IC_OTHER_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Listener", ":/png/instr/res/instrlistener.png", IC_OTHER_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Guitar+Vocal", ":/png/instr/res/instrguitarvocal.png", IC_MULTIPLE_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "None", ":/png/instr/res/instruments/instrnone.png", IC_OTHER_INSTRUMENT ) ); // special first element
+        vecDataBase.Add ( CInstPictProps ( "Drum Set", ":/png/instr/res/instruments/instrdrumset.png", IC_PERCUSSION_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Djembe", ":/png/instr/res/instruments/instrdjembe.png", IC_PERCUSSION_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Electric Guitar", ":/png/instr/res/instruments/instreguitar.png", IC_PLUCKING_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Acoustic Guitar", ":/png/instr/res/instruments/instraguitar.png", IC_PLUCKING_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Bass Guitar", ":/png/instr/res/instruments/instrbassguitar.png", IC_PLUCKING_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Keyboard", ":/png/instr/res/instruments/instrkeyboard.png", IC_KEYBOARD_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Synthesizer", ":/png/instr/res/instruments/instrsynthesizer.png", IC_KEYBOARD_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Grand Piano", ":/png/instr/res/instruments/instrgrandpiano.png", IC_KEYBOARD_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Accordion", ":/png/instr/res/instruments/instraccordeon.png", IC_KEYBOARD_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Vocal", ":/png/instr/res/instruments/instrvocal.png", IC_OTHER_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Microphone", ":/png/instr/res/instruments/instrmicrophone.png", IC_OTHER_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Harmonica", ":/png/instr/res/instruments/instrharmonica.png", IC_WIND_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Trumpet", ":/png/instr/res/instruments/instrtrumpet.png", IC_WIND_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Trombone", ":/png/instr/res/instruments/instrtrombone.png", IC_WIND_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "French Horn", ":/png/instr/res/instruments/instrfrenchhorn.png", IC_WIND_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Tuba", ":/png/instr/res/instruments/instrtuba.png", IC_WIND_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Saxophone", ":/png/instr/res/instruments/instrsaxophone.png", IC_WIND_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Clarinet", ":/png/instr/res/instruments/instrclarinet.png", IC_WIND_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Flute", ":/png/instr/res/instruments/instrflute.png", IC_WIND_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Violin", ":/png/instr/res/instruments/instrviolin.png", IC_STRING_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Cello", ":/png/instr/res/instruments/instrcello.png", IC_STRING_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Double Bass", ":/png/instr/res/instruments/instrdoublebass.png", IC_STRING_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Recorder", ":/png/instr/res/instruments/instrrecorder.png", IC_OTHER_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Streamer", ":/png/instr/res/instruments/instrstreamer.png", IC_OTHER_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Listener", ":/png/instr/res/instruments/instrlistener.png", IC_OTHER_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Guitar+Vocal", ":/png/instr/res/instruments/instrguitarvocal.png", IC_MULTIPLE_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Bodhran", ":/png/instr/res/instruments/bodhran.png", IC_PERCUSSION_INSTRUMENT ) );
 
         // now the table is initialized
         TableIsInitialized = true;

windows/sound.cpp

@@ -857,6 +857,7 @@ void CSound::bufferSwitch ( long index, ASIOBool )
         // call processing callback function
         pSound->ProcessCallback ( vecsTmpAudioSndCrdStereo );
 
+
         // PLAYBACK ------------------------------------------------------------
         for ( int i = 0; i < NUM_IN_OUT_CHANNELS; i++ )
         {