Skip to content

Commit d3a193d

Browse files
committed
exporter: Phase out --skip-unsupported option
Ruffle supports AVM2 movies pretty well now. Phasing out the --skip-unsupported option, but leaving it as a hidden option for backward compatibility.
1 parent 988b8e7 commit d3a193d

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

exporter/src/main.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ struct Opt {
7474
#[clap(long, short, default_value = "high")]
7575
power: PowerPreference,
7676

77-
/// Skip unsupported movie types (currently AVM 2)
78-
#[clap(long, action)]
77+
/// TODO Unused, remove after some time
78+
#[clap(long, action, hide = true)]
7979
skip_unsupported: bool,
8080
}
8181

@@ -87,14 +87,9 @@ fn take_screenshot(
8787
skipframes: u32,
8888
progress: &Option<ProgressBar>,
8989
size: SizeOpt,
90-
skip_unsupported: bool,
9190
) -> Result<Vec<RgbaImage>> {
9291
let movie = SwfMovie::from_path(swf_path, None).map_err(|e| anyhow!(e.to_string()))?;
9392

94-
if movie.is_action_script_3() && skip_unsupported {
95-
return Err(anyhow!("Skipping unsupported movie"));
96-
}
97-
9893
let width = size
9994
.width
10095
.map(f64::from)
@@ -228,7 +223,6 @@ fn capture_single_swf(descriptors: Arc<Descriptors>, opt: &Opt) -> Result<()> {
228223
opt.skipframes,
229224
&progress,
230225
opt.size,
231-
opt.skip_unsupported,
232226
)?;
233227

234228
if let Some(progress) = &progress {
@@ -322,7 +316,6 @@ fn capture_multiple_swfs(descriptors: Arc<Descriptors>, opt: &Opt) -> Result<()>
322316
opt.skipframes,
323317
&progress,
324318
opt.size,
325-
opt.skip_unsupported,
326319
) {
327320
let mut relative_path = file
328321
.path()

0 commit comments

Comments
 (0)