Skip to content

Commit 18bde47

Browse files
committed
Repackaging process stuff to be below jave too
1 parent 0e5c50d commit 18bde47

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

Changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
https://github.com/a-schild/jave2/pull/79
88
- Added support for arm64 linux
99
- Some code cleanups by mressler, thanks for the contribution
10+
- Deprecation of ws.schild.jave.FFMPEG* related process stuff,
11+
use ws.schild.jave.process.* instead
1012
- **2.7.4**
1113
- Upgraded to ffmpeg v 4.2.2
1214
- Windows and osx binaries from https://ffmpeg.zeranoe.com/builds/

jave-core/src/main/java/ws/schild/jave/FFMPEGExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* An ffmpeg process wrapper.
3030
*
3131
* @author Carlo Pelliccia
32-
* @deprecated As of 3.0.0. Use {@link ws.schild.process.ProcessWrapper} instead.
32+
* @deprecated As of 3.0.0. Use {@link ws.schild.jave.process.ProcessWrapper} instead.
3333
*/
3434
@Deprecated
3535
public class FFMPEGExecutor {

jave-core/src/main/java/ws/schild/jave/FFMPEGLocator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*
2525
* @author Carlo Pelliccia
2626
* @see Encoder
27-
* @deprecated As of 3.0.0. Use {@link ws.schild.process.ProcessLocator} instead. In 3.0.0, this will become an interface with a default method for createExecutor.
27+
* @deprecated As of 3.0.0. Use {@link ws.schild.jave.process.ProcessLocator} instead. In 3.0.0, this will become an interface with a default method for createExecutor.
2828
*/
2929
@Deprecated
3030
public abstract class FFMPEGLocator {
@@ -34,7 +34,7 @@ public abstract class FFMPEGLocator {
3434
* the current machine.
3535
*
3636
* @return The path of the ffmpeg executable.
37-
* @deprecated As of 3.0.0, this will become getExecutablePath. See {@link ws.schild.process.ProcessLocator#getExecutablePath}.
37+
* @deprecated As of 3.0.0, this will become getExecutablePath. See {@link ws.schild.jave.process.ProcessLocator#getExecutablePath}.
3838
*/
3939
@Deprecated
4040
protected abstract String getFFMPEGExecutablePath();

jave-core/src/main/java/ws/schild/jave/ProcessKiller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* processes at the jvm shutdown.
2424
*
2525
* @author Carlo Pelliccia
26-
* @deprecated As of 3.0.0. Use {@link ws.schild.process.ProcessKiller} instead.
26+
* @deprecated As of 3.0.0. Use {@link ws.schild.jave.process.ProcessKiller} instead.
2727
*/
2828
@Deprecated
2929
class ProcessKiller extends Thread {

jave-core/src/main/java/ws/schild/process/ProcessKiller.java renamed to jave-core/src/main/java/ws/schild/jave/process/ProcessKiller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* You should have received a copy of the GNU General Public License
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
19-
package ws.schild.process;
19+
package ws.schild.jave.process;
2020

2121
/**
2222
* A package-private utility to add a shutdown hook to kill ongoing encoding

jave-core/src/main/java/ws/schild/process/ProcessLocator.java renamed to jave-core/src/main/java/ws/schild/jave/process/ProcessLocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* You should have received a copy of the GNU General Public License
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
19-
package ws.schild.process;
19+
package ws.schild.jave.process;
2020

2121
import ws.schild.jave.Encoder;
2222

jave-core/src/main/java/ws/schild/process/ProcessWrapper.java renamed to jave-core/src/main/java/ws/schild/jave/process/ProcessWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* You should have received a copy of the GNU General Public License
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
19-
package ws.schild.process;
19+
package ws.schild.jave.process;
2020

2121
import java.io.IOException;
2222
import java.io.InputStream;

0 commit comments

Comments
 (0)