eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2734 commits 3 branches 0 tags 26 MiB
Commit graph

1917 commits

Author SHA1 Message Date
Volker Fischer
2bdc269d3f merge fixes (further fixes needed) 2020-06-20 17:51:03 +02:00
Volker Fischer
6de42e4d82 merge fixes (further fixes needed) 2020-06-20 17:44:34 +02:00
Adam Sampson
c9516f1962 Escape server and user names in the status HTML. 2020-06-20 16:43:18 +01:00
Volker Fischer
d6759e4d92
Merge pull request #379 from Alberstein8/master 
New Select switch to change several faders like one
 2020-06-20 17:31:10 +02:00
Volker Fischer
b7b39ba6f2 some fixes for headless mode 2020-06-20 17:26:52 +02:00
Alberstein8
25f10fcb6d Update audiomixerboard.cpp 2020-06-20 16:26:18 +02:00
Alberstein8
bd2cca5a2c New Select option to move faders at once 
New Select switch. All selected channels can be modified in their faders levels at the same time. Useful if channels are organized by instruments, set same level to similar instruments or to raise level of one particular set
 2020-06-20 16:20:27 +02:00
Volker Fischer
70d2a0e069 added a TODO comment 2020-06-20 13:47:15 +02:00
Volker Fischer
2ce9b4907e added empty Swedish translation files 2020-06-20 12:45:41 +02:00
Volker Fischer
dbb0148a70 changed translation management so that not only the PC language setting is used but also the country 2020-06-20 12:40:47 +02:00
Volker Fischer
db7a7599b6 bug fixes for OMP implementation 2020-06-19 21:29:09 +02:00
Volker Fischer
34d89fae4f Merge branch 'master' of https://github.com/corrados/jamulus 2020-06-19 16:23:11 +02:00
Volker Fischer
3ac8a2de8d Merge commit '0c7866eda3266bd7cba8bc6af03d969b777e188d' 2020-06-19 16:21:13 +02:00
daryl
d5434400a0 Update Spanish tr 2020-06-18 22:12:47 +02:00
ignotus
98075d355a
Merge pull request #3 from corrados/master 
update
 2020-06-18 22:11:28 +02:00
Volker Fischer
d52779518e update German translation 2020-06-18 21:12:12 +02:00
Volker Fischer
ed71214452 small fix 2020-06-18 21:06:39 +02:00
Volker Fischer
86e70b7d78 initialize pt_BR with pt_PT 2020-06-18 21:02:17 +02:00
Volker Fischer
44977e6557 added pt_BR initial translation file, update all translation files 2020-06-18 21:00:27 +02:00
Volker Fischer
86ddedb306 fix compiler warnings 2020-06-18 19:22:21 +02:00
Volker Fischer
e73b198f92 the local pan middle position is no longer attenuated in Mono-in/Stereo-out mode (#353) 2020-06-18 19:16:31 +02:00
Volker Fischer
30d8181423 some more merge fixes 2020-06-17 19:34:51 +02:00
Volker Fischer
a2a489e6f0 merge fixes 2020-06-17 19:26:24 +02:00
Hector Martin
1651a8d065 Add a "headless" build type which does not depend on QtGui/QtWidgets 2020-06-18 00:29:56 +09:00
Volker Fischer
dc7a844f0b bug fix with recording state indicator 2020-06-16 16:58:45 +02:00
daryl
4841437d46 Spanish tr update 2020-06-16 12:54:30 +02:00
Volker Fischer
c5e4d75be0 move the channels tighter together in slim fader mode; adjust help text so that we have as little HTML as possible to simplify translation 2020-06-15 22:45:11 +02:00
Volker Fischer
8d3cdb7a4b merge fixes 2020-06-15 21:48:30 +02:00
Peter L Jones
3f4125fe9d Client side changes for recorder state 2020-06-15 19:58:48 +01:00
Volker Fischer
fa0ff9faae merge fixes and some other stuff 2020-06-15 17:29:17 +02:00
Peter L Jones
ed10faea6d Define and send recorder state 2020-06-14 22:03:14 +01:00
Volker Fischer
cf543eab7c merge fixes 2020-06-14 21:00:19 +02:00
Peter L Jones
c7080afd0f Define protocol message for server jam recorder state publishing 2020-06-14 19:42:36 +01:00
Volker Fischer
ac140ff8a2 use actual instrument name for sorting by instrument 2020-06-14 19:17:50 +02:00
Volker Fischer
e883a51db9 support for storing/recovering the server window positions (#357) 2020-06-14 08:49:58 +02:00
Volker Fischer
2285148cb8 Reference HTML file for welcome message #361 2020-06-13 18:15:52 +02:00
Volker Fischer
1e80a8659b update translation files 2020-06-13 17:43:41 +02:00
Volker Fischer
b56a2491fb
Merge pull request #359 from dzpex/master 
New feature translated - IT
 2020-06-13 17:42:36 +02:00
Volker Fischer
1c89e75900 merge fixes 2020-06-13 17:41:44 +02:00
Alberstein8
7c73b93b9f Clean some empty lines to match original code 2020-06-13 14:58:36 +02:00
Alberstein8
61f25b5644 Removed iReceivedInstrument decalration 2020-06-13 14:15:24 +02:00
Alberstein8
8de92ed5f7 Sort by instrument, new sortby function with parameter to set order 
Sort by instrument added, using the same function for sorting by name or instrument
 2020-06-13 14:07:09 +02:00
dzpex
0578e8177e
New feature translated 2020-06-13 13:46:57 +02:00
Alberstein8
3dbddc5568
Merge branch 'master' into master 2020-06-13 11:29:21 +02:00
Jonathan
16dc091b48
Update for sort order 
Also a slight clarification
 2020-06-13 08:58:20 +01:00
Volker Fischer
ff31b99dc3 added Genre label 2020-06-13 09:29:51 +02:00
Volker Fischer
14cf23a1d7 fix: Jamulus Server window too wide #357 2020-06-13 09:27:31 +02:00
Volker Fischer
b078bfd7b8 further preparation for #356 2020-06-13 08:51:05 +02:00
Volker Fischer
e4b01fa395 prepare for pull request: #356 2020-06-13 08:31:28 +02:00
Volker Fischer
e1b982c34c merge fixes 2020-06-13 08:20:03 +02:00
Volker Fischer
83c34d061c
Merge pull request #352 from pljones/351-improve-recorder-logging 
Add recorder state to console
 2020-06-13 08:16:21 +02:00
Alberstein8
0aea018a61 Addded sort by instrument 2020-06-13 01:14:43 +02:00
Volker Fischer
4c94633c1a clean up the reverberation and panning code in the client 2020-06-12 18:26:34 +02:00
Peter L Jones
fe338049b2 Add recorder state to console 2020-06-11 20:52:49 +01:00
Volker Fischer
0d77ccdcc4 under Mac the slim fader label must be a bit higher so that all have the same length 2020-06-11 19:58:51 +02:00
Volker Fischer
bfc438ba20 rename new skin to Compact 2020-06-11 18:43:32 +02:00
Volker Fischer
cf7a01d231 add new "slim channel" skin, intended for large ensembles (#339) 2020-06-11 16:42:50 +02:00
Volker Fischer
ea4a3134f8 fixed a typo 2020-06-11 12:28:28 +02:00
Volker Fischer
cf7d297663 fix for headless client operation when terminated via SIGNAL 2020-06-11 12:26:37 +02:00
Volker Fischer
cd9a939697 revert "remove some more SLOT()" commit since Travis is not happy about the change (older Qt5 version) 2020-06-11 10:48:44 +02:00
Volker Fischer
eeeaafdcf5 remove some more SLOT() 2020-06-11 09:48:03 +02:00
Volker Fischer
78d77e323d some cleanup 2020-06-11 08:35:10 +02:00
Olivier Humbert
532f424c59
French translation update 2020-06-10 21:14:59 +02:00
Volker Fischer
a3d242e177 try to fix outstanding licence text issues (#341) 2020-06-10 20:04:09 +02:00
Volker Fischer
55af62b348 r3_5_6 2020-06-09 18:45:30 +02:00
Volker Fischer
cc9e854dc6 merge fixes for translation 2020-06-09 17:49:16 +02:00
Volker Fischer
e7b291d906 improve the channel sorting algorithm (much cleaner code now) 2020-06-09 17:42:32 +02:00
daryl
07e17cb376 tiny correction 2020-06-09 10:55:52 +02:00
Volker Fischer
1c4fe003d9 fix for Copyright -> add a date (see #341) 2020-06-08 23:20:25 +02:00
Volker Fischer
9abb853fe1 fixed "*No copyright*" (see #341) 2020-06-08 23:02:43 +02:00
Volker Fischer
44e883900b fixed Free Software Foundation address (see #341) 2020-06-08 22:58:11 +02:00
Volker Fischer
2aa8c8c0d5 update translations 2020-06-08 22:48:31 +02:00
Volker Fischer
5c18abd4c7
Merge branch 'master' into master 2020-06-08 22:45:48 +02:00
daryl
db05a4d88b Spanish tr update 2020-06-08 22:15:23 +02:00
Miguel de Matos
85e517c029
Update to Portuguese Translation 2020-06-08 21:04:13 +01:00
Volker Fischer
9c811782dc direct use of Q_UNUSED on OPUS calls does not suppress the warning under Linux -> go back to previous implementation 2020-06-08 22:02:16 +02:00
Volker Fischer
0c7866eda3 initial OMP processing tests 2020-06-08 21:47:36 +02:00
Volker Fischer
1880520f77 update German translation 2020-06-08 21:30:43 +02:00
Volker Fischer
dccfeb88c6 "Sort Channels by Name" -> "Sort Channel Users by Name" 2020-06-08 21:12:33 +02:00
Volker Fischer
c4866aff2f code cleanup 2020-06-08 17:40:59 +02:00
Volker Fischer
8d8b52ae06 support sorting faders by channel name (#178) 2020-06-08 17:34:45 +02:00
Volker Fischer
93ec45d9cc some small fixes 2020-06-07 13:08:06 +02:00
Volker Fischer
efc24ffdbe improvement: only send channel levels if they are different from the previous ones 2020-06-07 12:09:30 +02:00
Volker Fischer
6a896522f0 Qt4 -> Qt5 connection 2020-06-07 10:08:00 +02:00
Volker Fischer
af0f9510f8 resolve outstanding: using Qt5 connections instead of the old Qt4 ones 2020-06-07 09:01:52 +02:00
Volker Fischer
6f45cc5a00 small fix in German translation 2020-06-06 22:37:17 +02:00
Volker Fischer
9ae3a64110 update translation files 2020-06-06 22:35:03 +02:00
Volker Fischer
086d72c986 Merge branch 'master' of github.com:corrados/jamulus 2020-06-06 22:34:12 +02:00
Volker Fischer
16dcfa2b2a use darker black LEDs, see #222 2020-06-06 22:33:58 +02:00
ignotus
b20c1cb9e9
Merge pull request #10 from corrados/master 
using Qt5 connections instead of the old Qt4 ones (just a subset conv…
 2020-06-06 22:17:35 +02:00
daryl
ac25d26126 update 2020-06-06 22:16:15 +02:00
Volker Fischer
8edb3185b0 using Qt5 connections instead of the old Qt4 ones (just a subset converted right now, more TODO) 2020-06-06 22:15:33 +02:00
ignotus
da9bc481c5
Merge pull request #9 from corrados/master 
update
 2020-06-06 22:13:06 +02:00
Volker Fischer
e4ddf24758
Merge pull request #326 from pljones/feature/315-audacity-lof 
Feature/315 audacity lof
 2020-06-06 17:20:14 +02:00
Volker Fischer
0e2185ae01 using Qt5 connections instead of the old Qt4 ones (just a subset converted right now, more TODO) 2020-06-06 17:19:25 +02:00
Peter L Jones
552b3ba5f3 #315 Provide Audacity "list of file" for session 2020-06-06 16:05:32 +01:00
Volker Fischer
33073658c6 show channel numbers if --ctrlmidich is used (#241, #95) 2020-06-06 15:51:54 +02:00
Volker Fischer
ab92abfd63 update German translation 2020-06-06 13:51:06 +02:00
Volker Fischer
0bcb654ff7 some more work for German translation 2020-06-06 13:37:40 +02:00
Volker Fischer
09fe7d566c small updates 2020-06-06 11:02:31 +02:00
Volker Fischer
40cf36eb87 small fix 2020-06-06 10:24:22 +02:00
Jonathan
726d4c27a2
Added mute icon description 2020-06-05 22:01:36 +01:00
Jonathan
67a34bdff7
Add mute icon 2020-06-05 21:44:37 +01:00
Volker Fischer
81d000b773 merge fixes 2020-06-05 22:43:14 +02:00
Volker Fischer
a9dc06f167
Merge pull request #336 from Martyna27/master 
Initial polish translation
 2020-06-05 22:41:31 +02:00
Martyna27
2827b7689c Initial polish translation 2020-06-05 22:02:16 +02:00
ignotus
352389b8cb
Merge pull request #8 from corrados/master 
additional fix for #316 -> do not send valid IP address from server
 2020-06-05 21:50:48 +02:00
Volker Fischer
e7621af754 additional fix for #316 -> do not send valid IP address from server 2020-06-05 20:56:52 +02:00
ignotus
4c2d26efde
Merge pull request #7 from corrados/master 
update
 2020-06-05 14:35:14 +02:00
Volker Fischer
b1c97c2d36 avoid showing IP address if no name in the musician profile is given #316 2020-06-05 14:22:44 +02:00
daryl
ac0c26221b update 2020-06-05 13:44:36 +02:00
Volker Fischer
850883f3fc Merge branch 'master' of github.com:corrados/jamulus 2020-06-05 13:40:06 +02:00
Volker Fischer
cb48d6fb85 prepare for #316 2020-06-05 13:39:54 +02:00
ignotus
7b668d9a29
Update translation_es_ES.ts 2020-06-05 13:32:58 +02:00
ignotus
cea9212b6d
Merge pull request #5 from corrados/master 
some fixes for the German translations
 2020-06-05 13:31:44 +02:00
daryl
762991d13c Spanish tr update 2020-06-05 13:26:34 +02:00
Volker Fischer
781861cb3d some fixes for the German translations 2020-06-05 13:21:11 +02:00
Volker Fischer
b6cd0c16f4
Merge pull request #333 from ignotus666/master 
corrections
 2020-06-05 13:11:51 +02:00
Volker Fischer
b11b4024fe merge fixes 2020-06-05 13:10:59 +02:00
ignotus
724717312c
Update manual.md 2020-06-05 13:06:50 +02:00
ignotus
693dcf9962
Update clientdlg.cpp 2020-06-05 13:06:06 +02:00
ignotus
bab77e4695
Merge pull request #2 from corrados/master 
update
 2020-06-05 12:01:27 +02:00
Volker Fischer
7c7c0ad930 merge fixes 2020-06-05 11:19:04 +02:00
Volker Fischer
b3b52f74e0
Merge pull request #319 from dos1/ukulele 
instruments: Add ukulele and bass ukulele
 2020-06-05 11:05:28 +02:00
Volker Fischer
6b1737e74c permanent server is now a server which is on for 2 days (was changed to 3 days previously but 2 should be sufficient) 2020-06-05 11:03:24 +02:00
ignotus
b36097eba4
Added contributors back who got deleted for some reason 2020-06-04 22:52:02 +02:00
daryl
ffbe471427 corrections 2020-06-04 22:07:56 +02:00
ignotus
f1087591d1
Merge pull request #1 from corrados/master 
update
 2020-06-04 18:57:52 +02:00
daryl
94e75d66ec update Spanish translation 2020-06-04 18:56:37 +02:00
daryl
9e7dea91d8 updated help texts 2020-06-04 17:51:32 +02:00
ignotus
fbc2156283
Update connectdlg.cpp 2020-06-04 17:40:11 +02:00
daryl
4cf71c11a9 update 2020-06-04 17:35:14 +02:00
ignotus
706a92184e
Update clientsettingsdlg.cpp 2020-06-04 16:02:00 +02:00
ignotus
1923bf469e
Update clientsettingsdlg.cpp 2020-06-04 15:58:01 +02:00
ignotus
94b4ed854e
Update clientsettingsdlg.cpp 2020-06-04 15:48:53 +02:00
daryl
68cddb20ae update 2020-06-04 15:42:16 +02:00
daryl
c38cf1c825 update 2020-06-04 15:31:19 +02:00
Jonathan
be4d87409c
Corrections 
Incorrect (and incomplete) description of "muted" icon behaviour.
 2020-06-04 13:20:24 +01:00
daryl
3a01ede996 update 2020-06-04 13:36:14 +02:00
daryl
bd75c353cf update 2020-06-04 13:33:50 +02:00
ignotus
c68b943812
Update util.cpp 2020-06-04 12:28:28 +02:00
ignotus
7b7f65f4b3
Update util.cpp 2020-06-04 12:25:07 +02:00
ignotus
8fa4b8472b
Update util.cpp 2020-06-04 12:20:23 +02:00
daryl
e38e8d6f08 update 2020-06-04 11:53:04 +02:00
daryl
acadfd223d update 2020-06-04 11:49:53 +02:00
Alex Buckland
68ce14f533
Update small typo on manual.md 2020-06-04 00:50:40 +01:00
Sebastian Krzyszkowiak
a123498cbf
instruments: Add ukulele and bass ukulele 
The icons are derived from an Openclipart image by qubodup:
https://openclipart.org/detail/214439/simple-ukulele-no-outline
 2020-06-02 19:36:25 +02:00
Volker Fischer
cbdd93f36e merge fix 2020-06-01 22:28:47 +02:00
Gauthier Östervall
21d7ad291a Make level meter LED black when off 2020-06-01 21:27:56 +02:00
Volker Fischer
50ccb63163 merge fixes 2020-06-01 09:55:31 +02:00