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

1350 commits

Author SHA1 Message Date
Volker Fischer
ce66f844d1 bug fix: compatiblity to old server versions were incorrect for the server list 2020-04-11 19:52:53 +02:00
Volker Fischer
fc4463330b revert back: code did not work correctly 2020-04-11 18:48:40 +02:00
Volker Fischer
61e1a73f67 try to fix an issue that people do not see their server on the same PC anymore 2020-04-11 18:35:49 +02:00
Volker Fischer
b080378c06 change "Register My Server in the Server List at the Central Server" to "Make My Server Public (Register My Server in the Server List)" 2020-04-11 18:31:21 +02:00
Volker Fischer
82f5ad18f4 added support for Central Server (North America) (Ticket #50), small bug fix for the Mac audio interface 2020-04-11 14:27:50 +02:00
Volker Fischer
1d4342bb7c move country flag function in new class CLocale 2020-04-11 10:31:26 +02:00
Volker Fischer
339457298c more mixer faders settings to store, define North America port number as 22224 2020-04-11 10:03:23 +02:00
Volker Fischer
d0c0a4722a integrated the essential changes from emlynmac from https://github.com/corrados/jamulus/pull/44 2020-04-10 20:29:14 +02:00
Volker Fischer
854d5a128f link to the Github Contributors list in the Readme and About dialog 2020-04-10 20:06:32 +02:00
Peter L Jones
a78ac71798 Pass frame size to frame handlers 2020-04-10 18:36:13 +01:00
Peter L Jones
ec2673eaa1 Pass frame size to Reaper project from recorder 2020-04-10 18:36:13 +01:00
Peter L Jones
e4ac2f472d Use variable frame size in Reaper project 2020-04-10 18:36:13 +01:00
Peter L Jones
a80b437858 Pass frame size to recorder 2020-04-10 18:36:13 +01:00
Peter L Jones
3831e83535 Migrate off ConsoleWriterFactory 2020-04-10 18:36:13 +01:00
Volker Fischer
631c473acc CreateLevelsForAllConChannels shall call CStereoSignalLevelMeter::CalcLogResult 2020-04-10 16:56:45 +02:00
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
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
cd946a9950 moved servermanual.md to correct place 2020-04-09 15:55:46 +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
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
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
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
6b26cb02b4 use 3 seconds audio fade-in at the server instead of just 2 seconds 2020-04-01 21:47:49 +02:00
Volker Fischer
ee48000b34 fix the MAX_SIZE_BYTES_NETW_BUF, change the --showallservers to include the server list index and do not sort by ping 2020-04-01 21:16:44 +02:00
Volker Fischer
63d8d58767 bug fix for Qt style sheets for main window 2020-04-01 18:41:59 +02:00
Volker Fischer
bef3506a38 added a scroll area to the mixer board so that a large number of clients can be supported, thanks to doloopuntil for his example code 2020-03-30 19:53:30 +02:00
Volker Fischer
40dd2e8980 changed the maximum number of clients from 40 to 50 2020-03-29 21:35:09 +02:00
Volker Fischer
4cfd54b21b audio fade-in at the server if new client connects 2020-03-29 18:03:24 +02:00
Volker Fischer
3eaec8363a changed the maximum number of clients from 20 to 40 2020-03-29 16:14:29 +02:00
Volker Fischer
15bad6738e slight audio quality improvement for 64 samples stereo high quality mode 2020-03-29 12:58:45 +02:00
Volker Fischer
29f8e843a9 Merge remote-tracking branch 'origin/linuxfixesbyjkohnert' 2020-03-29 12:18:04 +02:00
root
ead042a301 patch provided by jkohnert, see Ticket #63 Fix compiler warnings on Linux 2020-03-29 12:12:13 +02:00
Volker Fischer
366aaee9ab use "normal" audio quality as the default when first startup of Jamulus after installation 2020-03-29 12:00:36 +02:00
Volker Fischer
eed07615e5 fix the IIR filter lambdas for 64 samples frame size 2020-03-28 21:02:55 +01:00
Volker Fischer
ede92ac25e fix https://sourceforge.net/p/llcon/bugs/30 2020-03-28 18:51:25 +01:00
Volker Fischer
53f50070a7 some more work for 64 samples frame size support 2020-03-28 16:27:45 +01:00
Jonathan
7bc89f2d1a
Remove server section 
And corrected a couple of typos.
 2020-03-28 15:01:31 +00:00
Volker Fischer
beb3255b26 tested the numbers and they work fine 2020-03-28 09:41:31 +01:00
Volker Fischer
fbef9556a4 prepare OPUS rates for 64 samples, not yet tested 2020-03-28 09:17:13 +01:00
Volker Fischer
5e5637670d increase the maximum number of servers in the server list from 100 to 200 2020-03-24 22:23:49 +01:00
Daniel Masato
adbb850a2f Merge remote-tracking branch 'upstream/master' 2020-03-23 19:45:03 +00:00
Daniel Masato
26ccef90fc Fix server bug preventing recording directory from being recognised after successful creation 
When a recording directory doesn't exist, the server creates it successfully but the QFileInfo
object holding the directory information is not updated as the information is cached by default.
The server then exits unexpectedly as the check on the directory existence incorrectly fails.
Disable caching to resolve the issue.
 2020-03-23 19:31:38 +00:00
Volker Fischer
4cac0e935b code style changes 2020-03-22 20:24:30 +01:00
Peter L Jones
eca8eff4c9 Revert --histitems argument 2020-03-22 17:45:00 +00:00
Peter L Jones
32e56ff0c6 Pass number of items and days 2020-03-21 22:20:18 +00:00
Peter L Jones
f20d7feab1 Accept number of items and days as arguments 2020-03-21 22:19:29 +00:00
Peter L Jones
f04eb1e7ed Move history defines to global.h 2020-03-21 22:19:29 +00:00
Peter L Jones
2f06553b0b Resize points to avoid overlap 2020-03-21 22:18:23 +00:00
Volker Fischer
fccbb4144c some small cleanups 2020-03-21 10:27:31 +01:00
Volker Fischer
f55c669e5e code style changes 2020-03-21 09:54:43 +01:00
corrados
f605c35935
Merge pull request #13 from pljones/feature/covid19-date-limit-on-historygraph 
Enhance historygraph to allow size based on date
 2020-03-21 09:34:24 +01:00
Peter L Jones
b55aa67496 Enhance historygraph to allow size based on date 
Due to the increasing number of connections, the *number* of history
entries is no longer a good way to size the width of the graph.
In addition to adding a much larger FIFO, I have chosen to add
a date constraint.  This means I do not have to keep making the FIFO
bigger daily and, when numbers fall, the graph will not change
shape.
 2020-03-20 23:03:56 +00:00
Volker Fischer
1a45d6b095 added a comment 2020-01-04 15:01:48 +01:00
Volker Fischer
791d600634 2019->2020 2020-01-01 15:41:43 +01:00
Volker Fischer
b153d83654 moved ParseMIDIMessage function to the bottom of the file 2019-09-28 13:24:48 +02:00
Volker Fischer
81b5cf7861 added command line argument for disabling auto jack connection (Ticket #49) 2019-09-22 20:13:08 +02:00
Volker Fischer
e10eb4a512 use a separate markdown file for the manual 2019-08-24 09:32:17 +02:00
Volker Fischer
9398d80bfb added a missing header for Windows 2019-07-09 09:16:38 +02:00
Volker Fischer
11938e960b use #pragma once 2019-07-09 08:52:38 +02:00
Volker Fischer
96777cbab2 add support for IPv6 for ParseNetworkAddress 2019-07-08 17:02:05 +02:00
Volker Fischer
b7df71e596 - Linux server start script: removed welcome message, fix in server info 
- removed command line outputs for Svg/Jpeg modes used
- use the default country if no country is given in the command line options
 2019-06-20 11:41:29 +02:00
corrados
05dc96845f
Update vstsound.h 
code style changes
 2019-06-16 11:31:46 +02:00
corrados
e295a6d063
Update vstmain.h 
code style changes
 2019-06-16 11:31:09 +02:00
corrados
2c9d0f5910
Update vstmain.cpp 
code style changes
 2019-06-16 11:30:30 +02:00
Volker Fischer
021e8e58bd moved file 2019-06-16 10:08:49 +02:00
Volker Fischer
b9749b5722 moved file 2019-06-16 10:07:14 +02:00
Volker Fischer
fdfabebecc added homepage image files 2019-06-16 10:05:58 +02:00
corrados
1aa48ce8d5
Add files via upload 2019-06-16 09:01:11 +02:00
Volker Fischer
706a196b5f per default expand list view items in the server list which have connected clients 2019-05-30 18:12:55 +02:00
Volker Fischer
89e5f04e8a jamulus.desktop file was moved 2019-05-30 09:51:29 +02:00
Volker Fischer
b3f21c80fd updated some texts 2019-05-27 18:07:52 +02:00
Volker Fischer
d605ef6f9b code style changes 2019-05-27 18:04:24 +02:00
Peter L Jones
4dffa9615a Add (C) and GPL2 banners 2019-05-26 19:23:13 +01:00
Peter L Jones
78897e0995 Reduce to single history graph source 2019-05-26 19:16:45 +01:00
Peter L Jones
ea022759b2 Reduce to single history graph header 2019-05-26 19:00:09 +01:00
Peter L Jones
450fe4b530 Fix alignment of markers to axes 2019-05-26 18:43:11 +01:00
Peter L Jones
c6a43dbffa Fix unsigned usage in signed contexts 2019-05-26 18:42:46 +01:00
Peter L Jones
331de68e86 Refactor, refactor, refactor 2019-05-20 21:06:09 +01:00
Peter L Jones
387a34132c Minor fixes 2019-05-19 14:01:30 +01:00
Peter L Jones
50f69ec7e4 SVG history graph 2019-05-19 12:20:34 +01:00
Volker Fischer
fa0f122638 fixed warnings shown in QtCreator 2019-05-17 22:55:46 +02:00
Volker Fischer
6f12d8395a remove PROTMESSID_OPUS_SUPPORTED since it is not required anymore 2019-05-17 22:16:19 +02:00
Volker Fischer
6466a4aaf7 cleanup some 'COMPATIBILITY OLD VERSION, TO BE REMOVED' 2019-05-17 22:06:48 +02:00
Peter L Jones
e3025e5492 Fix wave file header lengths 2019-04-21 22:13:07 +01:00
Volker Fischer
1d2a240eec fix some texts 2019-04-13 12:52:44 +02:00
Volker Fischer
0d9c98f9be mention pljones in the About dialog and README 2019-04-12 19:01:21 +02:00
Volker Fischer
b1874d193f small fixes 2019-04-12 18:55:43 +02:00
Volker Fischer
a6a10d537e take old code again 2019-04-12 18:49:49 +02:00
Volker Fischer
aa036a08e3 small fixes 2019-04-12 18:48:20 +02:00
Volker Fischer
4a86ccda4f I fear a memory leak -> better solution required... 2019-04-12 18:48:06 +02:00
Volker Fischer
53fb06b137 "compress" the keyPressEvent a bit :-) 2019-04-12 18:42:05 +02:00
Volker Fischer
3348056253 move ConsoleWriterFactory implementation in util.cpp 2019-04-12 18:24:35 +02:00
Volker Fischer
feaea570f2 use the application pointer directly without the need of the define 2019-04-12 18:12:22 +02:00
Volker Fischer
05a0ac60a6 fixed warnings 2019-04-12 18:04:28 +02:00
Volker Fischer
8367ecc64f remove -T command line argument since it was only intended for debugging (see pull request from pljones). 2019-04-12 18:02:26 +02:00
Volker Fischer
30b5833d3d - remove unnecessary command line argument (if directory is given, the recording is enabled automatically 
- jamrecorder is not a pointer in the class but an object now
- only call jamrecorder functions if it is enabled
 2019-04-11 22:25:36 +02:00
Volker Fischer
0dbef268a3 added GPL headers 2019-04-10 20:00:54 +02:00
Peter L Jones
005a506b0d
Merge branch 'master' into feature/pljones-audio-stream-saving 2019-04-03 18:14:49 +01:00
Peter L Jones
8c1deffda7 Add recording support with Reaper Project generation 
Includes the following changes

* Initial .gitignore
Administrative

* Fix up warning message
* Not all Windows file systems are case insensitive
Bugfixes

* (Qt5) Use QCoreApplication for headless
Possible solution to get the application to run as a headless server but it loses the nice history graph, so not ideal.

* Avoid ESC closing chat
Because ESC shouldn't close the chat window. Or the main app window.

* Add console logging support for Windows
Whilst looking for the headless support, I found this idea for Windows logging.  New improved version.  This makes far fewer changes.

----

* Add recording support with Reaper Project generation
The main feature!
    * New -r option to enable recording of PCM files and conversion to Reaper RPP with WAV files
    * New -R option to set the directory in which to create recording sessions
    You need to specify the -R option, there's no default... so I guess -r and -R could be combined.
    * New -T option to convert a session directory with PCM files into a Reaper RPP with WAV files
    You can use -T on "failed" sessions, if the -r option captures the PCMs but the RPP converter doesn't run for some reaon. (It was useful during development, maybe less so once things seem stable.)

The recorder is implemented as a new thread with queuing from the main "real time" server thread.

When a new client connects or if its audio format changes (e.g. mono to stereo), a new RIFF WAVE file is started.  Each frame of decompressed audio for each client written out as LPCM to the file.  When the client disconnects, the RIFF WAVE headers are updated to reflect the file length.

Once all clients disconnect, the session is considered ended and a Reaper RPP file is written.
 2019-04-03 18:12:45 +01:00
Volker Fischer
e8096e48f0 2018 -> 2019 2019-03-24 09:30:30 +01:00
Volker Fischer
3609332754 use the given MIDI channel number of filtering input MIDI messages (channel number 0 means that we listen to all channels) 2019-01-22 16:11:41 +00:00
Volker Fischer
2a73d6878e fix for Behringer X-Touch 2019-01-21 15:59:25 +00:00
Volker Fischer
4e1b39236d implement MIDI controller parsing (first version, not yet tested) 2019-01-19 08:19:31 +00:00
Volker Fischer
9434a208ce first MIDI controller implementation: TD-20 Hi-Hat control can set fader level of first audio channel 2019-01-12 15:29:45 +00:00
Volker Fischer
d36cd17815 preparation for MIDI controller audio fader level support 2019-01-12 14:32:41 +00:00
Volker Fischer
91642b0c2e use integer for the fader level message 2019-01-12 12:59:16 +00:00
Volker Fischer
ea24503fdc preparation for MIDI controller audio fader level support 2019-01-12 12:45:08 +00:00
Volker Fischer
29332269c9 support native Jack support under Windows using the CONFIG switch "jackonwindows" 2018-03-22 20:50:05 +00:00
Volker Fischer
5c3bc50764 fixed a compiler warning 2018-03-22 20:47:08 +00:00
Volker Fischer
aaa766a659 make sure we do not get a too long horizontal scroll bar 2018-03-20 17:10:25 +00:00
Volker Fischer
8bfdc7347a 2017 -> 2018 2018-03-09 21:13:02 +00:00
Volker Fischer
a75670944a possible fix for a crash on MacOS High Sierra (reported in the Jamulus forum) 2018-03-08 20:03:07 +00:00
Volker Fischer
6c8362ea3a fix compiplation error on MacOS 2018-02-25 08:50:58 +00:00
Volker Fischer
b0d37c86e7 2016 -> 2017 2017-08-11 21:08:54 +00:00
Volker Fischer
492ae88fb2 new Qt URL 2017-05-25 20:06:59 +00:00
Volker Fischer
9c1ddbba64 added support for jackonmac 2016-07-31 08:02:32 +00:00
Volker Fischer
fd69efb060 bug fix with the history graph plotting (an invalid point was added to the graph) 2016-03-06 10:39:59 +00:00
Volker Fischer
403bf81f2a removed some unnecessary code 2016-03-06 10:09:41 +00:00