Procházet zdrojové kódy

move platform-specific stuff to lower level

master
Jonathan Cobb před 3 roky
rodič
revize
5d60981f51
2 změnil soubory, kde provedl 2 přidání a 5 odebrání
  1. +1
    -4
      src/main/java/jvcl/operation/exec/MergeAudioExec.java
  2. +1
    -1
      utils/cobbzilla-utils

+ 1
- 4
src/main/java/jvcl/operation/exec/MergeAudioExec.java Zobrazit soubor

@@ -19,8 +19,6 @@ import java.util.Map;
import static java.math.BigDecimal.ZERO;
import static org.cobbzilla.util.daemon.ZillaRuntime.die;
import static org.cobbzilla.util.io.FileUtil.*;
import static org.cobbzilla.util.system.OsType.CURRENT_OS;
import static org.cobbzilla.util.system.OsType.windows;

@Slf4j
public class MergeAudioExec extends SingleOrMultiSourceExecBase<MergeAudioOperation> {
@@ -110,8 +108,7 @@ public class MergeAudioExec extends SingleOrMultiSourceExecBase<MergeAudioOperat
ctx.put("padded", paddedName);

// create a temp dir for concat, it really likes to have everything in the same directory
final boolean doChmod = CURRENT_OS != windows; // don't chmod the dir on windows
@Cleanup("delete") final TempDir tempDir = new TempDir(assetManager.getScratchDir(), doChmod);
@Cleanup("delete") final TempDir tempDir = new TempDir(assetManager.getScratchDir());
ctx.put("tempDir", abs(tempDir));

final String silenceName = basename(silence.getPath());


+ 1
- 1
utils/cobbzilla-utils

@@ -1 +1 @@
Subproject commit d9e13332dbba7d3d95a582f50609e62becaab9cc
Subproject commit 8cdea3ac79f5d890ba765665624c981990076c98

Načítá se…
Zrušit
Uložit