Commit graph

2604 commits

Author SHA1 Message Date
Volker Fischer
9503630c4a Merge branch 'master' of https://github.com/corrados/jamulus
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2020-04-10 16:28:28 +02:00
Volker Fischer
4fb9e14669 fixed column widths are slightly too narrow for "Ping Time" and "Musicians" and typos 2020-04-10 16:24:53 +02:00
corrados
cf8642ad8b
Merge pull request #48 from pljones/feature/27-local-server-in-server-list
Use server internal address in server list
2020-04-10 13:47:45 +02:00
Peter L Jones
942bdde3a5 Tune IP look up code 2020-04-10 12:26:07 +01:00
Peter L Jones
2d59e869bc CHostAddr operator== does the job 2020-04-10 12:26:07 +01:00
Peter L Jones
4c286d8f43 Resolve casts to target types 2020-04-10 12:26:07 +01:00
Peter L Jones
bc04ff2fb2 Use server internal address in server list 2020-04-10 12:26:07 +01:00
Volker Fischer
ed46357ac4 added command line argument for new 64 samples server mode 2020-04-10 12:28:50 +02:00
Volker Fischer
dca678c83c support 128 frame size if server operates in 64 frame size 2020-04-10 12:07:23 +02:00
Volker Fischer
32e8eb7e94 support correct auto jitter buffer settings for 64 and 128 samples frame size 2020-04-09 21:26:40 +02:00
Volker Fischer
16ecb72ecd small fix 2020-04-09 15:57:10 +02:00
Volker Fischer
cd946a9950 moved servermanual.md to correct place 2020-04-09 15:55:46 +02:00
Volker Fischer
faac172af7 prepare for next version 2020-04-09 14:05:01 +02:00
Volker Fischer
7304aec1b2 r3_4_6 2020-04-09 13:23:54 +02:00
Volker Fischer
a0934ee8b8 some more work for 64 samples support in the server 2020-04-08 18:51:51 +02:00
Volker Fischer
5824855252 added show licence switch in the server GUI 2020-04-08 15:30:32 +02:00
Volker Fischer
e7bb2ad1c6 fix audio issue with licence dialog 2020-04-08 14:48:33 +02:00
Volker Fischer
c7dcfe855e bug fix for server 64 samples support 2020-04-07 22:09:29 +02:00
Volker Fischer
0eedcd8061 fixed Mac compilation error 2020-04-07 19:45:28 +02:00
Volker Fischer
ac21104cd0 only show level meters if the server actually supports it and sends network packets with levels to the client 2020-04-07 00:20:32 +02:00
Volker Fischer
70c499a82a fix for #71 Increase "stability" of Connection Setup server list 2020-04-06 23:06:28 +02:00
Volker Fischer
0011f6686a minor cleanup 2020-04-06 22:03:35 +02:00
Volker Fischer
f0ae93a07b update change log 2020-04-06 21:08:36 +02:00
corrados
94ad067047
Merge pull request #42 from pljones/feature/channel-meters
Feature/channel meters
2020-04-06 20:13:29 +02:00
Peter L Jones
c6b702cabe Update user manual for channel level meters.
Also includes a number of minor wording changes elsewhere.
2020-04-06 18:58:50 +01:00
Peter L Jones
a97ac9aa4e Server processing for channel levels 2020-04-06 18:58:50 +01:00
Peter L Jones
95f48eb17e Add server-side handling for channel level preference 2020-04-06 18:58:50 +01:00
Peter L Jones
30c4e006b6 Add client-side handling for channel levels 2020-04-06 18:58:50 +01:00
Peter L Jones
36e54f4da7 Add a preference for the Channel Levels 2020-04-06 18:58:50 +01:00
Peter L Jones
8db54e8616 Add channel level LED bar 2020-04-06 18:58:50 +01:00
Peter L Jones
a7a1549fe5 Define new protocol messages 2020-04-06 18:58:50 +01:00
Peter L Jones
70480cd626 Expose and rename CMultiColorLEDBar defines 2020-04-06 18:54:56 +01:00
Volker Fischer
321f286a6d re-introduce PROTMESSID_OPUS_SUPPORTED message to support older client versions 2020-04-06 17:17:49 +02:00
Volker Fischer
d12877dc8c should fix "low-res icon issue #28" 2020-04-05 22:12:53 +02:00
Volker Fischer
e805cff4ea prepare simple conversion buffer for other way around 2020-04-05 20:56:05 +02:00
Volker Fischer
fc9970f837 fixed Linux compilation error 2020-04-05 18:57:28 +02:00
Volker Fischer
a3b0215128 I reduced the number of stored fader settings to avoid having the ini file being too large 2020-04-05 17:57:39 +02:00
corrados
e89b871326
Merge pull request #37 from doloopuntil/save_mute_settings
Store mute settings for faders.
2020-04-05 17:48:12 +02:00
Volker Fischer
bd111c3abc some code cleanup 2020-04-05 17:35:40 +02:00
Volker Fischer
a761f9bf9e some code cleanup and small fix for audio compression (should not access the info outside the mutex because it might have changed by another thread) 2020-04-05 09:34:00 +02:00
Volker Fischer
c310aa16cd WIP 64 samples frame size support in the server, not yet working 2020-04-05 08:13:53 +02:00
Daniel Masato
83fb9d47b5 Store mute settings for faders.
Also increase stored fader settings capacity to 200, since up to 50 clients are now supported.
2020-04-04 21:27:35 +01:00
Volker Fischer
57f203502c WIP on support of 64/128 samples frame size in the server 2020-04-04 19:03:19 +02:00
Volker Fischer
0bdf6a45ae the travis Windows build seems not to work anymore but Jamulus compiles fine on my Windows PC -> disable the Windows build on travis for now 2020-04-04 12:18:11 +02:00
Volker Fischer
5a05bf6a2f only use low complexity OPUS processing for 128 samples frame size, see https://sourceforge.net/p/llcon/discussion/533517/thread/bdb3fe2195 2020-04-04 12:40:13 +02:00
Volker Fischer
61ea6ca0d0 prepare for next version 2020-04-04 09:12:42 +02:00
Volker Fischer
149ecf0c80 r3.4.5 2020-04-04 08:31:31 +02:00
Volker Fischer
b9c6d87766 bug fix: server list ping times may not be accurate and client list may not be retrieved 2020-04-03 21:45:36 +02:00
Volker Fischer
324287beda support hybrid x86 and x64 installer for Windows 2020-04-02 22:08:45 +02:00
Volker Fischer
6b26cb02b4 use 3 seconds audio fade-in at the server instead of just 2 seconds 2020-04-01 21:47:49 +02:00