davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity
538 Commits 3 Branches 3 Tags 18 MiB
Commit Graph

538 Commits

Author SHA1 Message Date
0xboobface 7f881504a6 Merge branch 'master' into mpegts-streamer 2018-09-07 17:24:36 +02:00
0xboobface cda1f25dc0 Remove segment mergers 
Segment mergers are not needed anymore. Segments get merged during the
recording or during the download from the server.
 2018-09-07 17:23:42 +02:00
0xboobface 7cc5764461 Add System property ctbrec.server.mode on server startup 
This property gets set by the server, so that we know,
if we are running in server mode or not
 2018-09-07 17:20:07 +02:00
0xboobface 3cf3f2751e Improved logging message 2018-09-07 16:51:12 +02:00
0xboobface 51d48bbe87 Remove unnecessary throw clause 
Rmove unnecessary throw IOException clause from the constructor of
InputStreamMTSSource
 2018-09-07 16:50:24 +02:00
0xboobface b91888f2ae Improve logging messages 2018-09-07 16:46:49 +02:00
0xboobface 85618289d5 Remove dead code 2018-09-07 15:44:22 +02:00
0xboobface 5df0c25a9d Organize imports 2018-09-07 15:43:59 +02:00
0xboobface 4054ceed96 Bumb version to 1.5.0-SNAPSHOT 2018-09-07 15:38:09 +02:00
0xboobface 7da0aefb35 Update download links to 1.4.3 2018-09-07 15:31:29 +02:00
0xboobface 2555b97944 Bumb version to 1.4.3 2018-09-07 15:28:43 +02:00
0xboobface 2ed07f98a7 Update changelog 2018-09-07 15:28:17 +02:00
0xboobface 017a091d84 Merge branch 'master' into mpegts-streamer 2018-09-07 15:25:21 +02:00
0xboobface 834f6b492c Remove rhino from dependencies 
No idea how it ended up in there
 2018-09-07 15:23:31 +02:00
0xboobface 1d7dd0d0e8 Merge branch 'master' into mpegts-streamer 2018-09-07 15:20:06 +02:00
0xboobface 698ba72120 Integrate mpegts-streamer to save a recording to a single file 
Integrate a modified version of mpegts-streamer (https://github.com/igilham/mpegts-streamer)
Add BlockingMultiMTSSource to mpegts-streamer, which is used to add new InputStreamMTSSources
online for each segment.

Remove all settings and methods, which are needed for segment merging.
 2018-09-07 15:16:08 +02:00
0xboobface a147c1b26c Add check for JavaFX on start 
On startup check if the application is running on the OpenJDK JVM. If that is the case,
check that JavaFX is available (because OpenJDK comes without JavaFX, it has to be installed
separately). If it is not available, log an error what to do and exit.
 2018-09-07 14:31:18 +02:00
0xboobface 9ba0fd624f Save and restore window size, location and maximized state 
Save and restore window size, location and maximized state so that
the window opens in the exact same state as when it has been closed.
 2018-09-05 14:24:22 +02:00
0xboobface 7d36586b04 Make thumbnail size configurable 
Add combobox on the bottom of ThumbOverviewTab.
Add integer thumbWidth to the Settings to save and restore the selected
 value between sessions. Set the selected value for all thumbnails on
all tabs.
 2018-09-05 13:54:44 +02:00
0xboobface e0ff933cba Update changelog 2018-09-04 17:05:45 +02:00
0xboobface 22d32bcc64 Add possibility to switch the stream resolution for a recording 
Add the possibility to switch the stream resolution for a model, which
already is recorded by the recorder. This makes it more convenient to
switch the resolution, if you already have a bunch of models in the
recorder list.
 2018-09-04 16:50:38 +02:00
0xboobface c80f81d937 Add comment and log statement 2018-09-04 16:27:55 +02:00
0xboobface 0cb4b3d9a4 Move stream resolution selection dialog to its own class 2018-09-04 14:55:48 +02:00
0xboobface c4d096eadf Bumbed version to 1.4.3-SNAPSHOT 2018-09-04 14:07:09 +02:00
0xboobface 14ec55ccb0 Set download links to version 1.4.2 2018-09-04 13:42:29 +02:00
0xboobface 1002725c62 Bumbed version to 1.4.2 2018-09-04 13:31:37 +02:00
0xboobface e33c6a3d94 Don't overwrite stream url index for a model on an update 
When the manual selection of stream resolution is enabled, the index of
the selected stream is saved in the model object. Don't overwrite this
value, if the model objects get updated, so that the value is persistent
even between sessions.
 2018-09-04 13:28:48 +02:00
0xboobface 6383bfb372 Update changelog 2018-08-30 18:54:11 +02:00
0xboobface 79a1ccc011 Enable proxy authentication for SOCKS4 and HTTP 2018-08-30 13:18:19 +02:00
0xboobface cd827a0cb8 Ignore empty recordings directories 2018-08-30 13:04:35 +02:00
0xboobface c57e0c037c Bump version to 1.4.2-SNAPSHOT 2018-08-29 14:37:26 +02:00
0xboobface a312a61d61 Update download links to 1.4.1 2018-08-29 14:37:01 +02:00
0xboobface 57b4ca3bca Bumb version to 1.4.1 2018-08-29 14:31:33 +02:00
0xboobface 0fd04d8afa Update changelog 2018-08-29 14:30:59 +02:00
0xboobface cd5046b961 Add WebView to UpdateTab, which shows the chagelog 2018-08-29 14:27:21 +02:00
0xboobface ef3e6d96c2 Add changelog file 2018-08-29 14:23:18 +02:00
0xboobface 13c5bdfd40 Change labels in the merge settings 
Change labels in the merge settings to make it clearer, that the merge
directory also affects the manual merge
 2018-08-29 14:03:43 +02:00
0xboobface 154995a760 Add version number to window title 2018-08-29 14:02:16 +02:00
0xboobface 8d4ba6d513 Fix status switching between FINISHED and DOWNLOADING 
Do not change the status from an update, if it is in the status
DOWNLOADING. Reason: The FINISHED status is overwritten with
DOWNLOADING, if the recording is downloading. But during the update of
the recordings, it gets reset with the FINISHED status from the server
until it is overriden again.
 2018-08-28 17:16:44 +02:00
0xboobface f30d13609b Improve exception handling 
Make sure, the status is reset to FINISHED, if something goes wrong
while downloading, so that the context menu is reactivated
 2018-08-28 17:13:35 +02:00
0xboobface 1383199532 Rename generatingPlaylistProgress to progress 
Rename generatingPlaylistProgress to progress, since it is used for
merging and downloading, too
 2018-08-28 17:12:46 +02:00
0xboobface 89a1737536 Improved logging 2018-08-28 17:12:09 +02:00
0xboobface 4821ba42b8 Close http response in update checker 2018-08-28 15:22:34 +02:00
0xboobface 32e060ceb2 Add update check 
Add update check, which checks the github API to retrieve the latest
version and opens a tab, if new update is available.
 2018-08-28 14:48:00 +02:00
0xboobface 4c32dc84f5 Fix status and progress update in recordings table 
Fix status and progress update in recordings table, which didn't work
correctly for the merge process.
 2018-08-28 13:04:02 +02:00
0xboobface 4f1f9ce5d5 Introduce interface for SegmentMerger 
Extract public methods of SegmentMerger to an interface, so that
different implementations are possible. This is a first try to see, if
an FFmpeg merger would work reliably.
 2018-08-28 13:02:49 +02:00
0xboobface 431724ce14 Extract DevNull OutputStream to its own class 
Extract DevNull to its own class, so that it can be used by other
classes.
 2018-08-28 12:57:55 +02:00
0xboobface 3a718cc92c Remove System.out.println 2018-08-27 18:41:53 +02:00
0xboobface 5494702f60 Update classpath to latest JDK 1.8 release 2018-08-27 18:16:01 +02:00
0xboobface e09d0c35aa Add proxy settings 
Add titled pane to settings tab to configure a proxy. Assign the proxy
settings on start to the according System properties (see
https://docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html#Proxies),
so that they get picked up by okhttp, HttpUrlConnection etc.
 2018-08-27 18:15:40 +02:00