Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit aeaa9020 authored by Simon Chan's avatar Simon Chan
Browse files

fix(scrcpy): remove extra `version` parameters

parent 8c5b3c26

libraries/adb-scrcpy/src/client.ts

+4 −6
Original line number Original line Diff line number Diff line
@@ -217,28 +217,26 @@ export class AdbScrcpyClient { 
     * This method will modify the given `options`,

     * This method will modify the given `options`,

     * so don't reuse it elsewhere.

     * so don't reuse it elsewhere.

     */

     */

    static async getEncoders(

    static getEncoders(

        adb: Adb,

        adb: Adb,

        path: string,

        path: string,

        version: string,

        options: AdbScrcpyOptions<object>,

        options: AdbScrcpyOptions<object>,

    ): Promise<ScrcpyEncoder[]> {

    ): Promise<ScrcpyEncoder[]> {

        options.setListEncoders();

        options.setListEncoders();

        return await options.getEncoders(adb, path, version);

        return options.getEncoders(adb, path);

    }

    }





    /**

    /**

     * This method will modify the given `options`,

     * This method will modify the given `options`,

     * so don't reuse it elsewhere.

     * so don't reuse it elsewhere.

     */

     */

    static async getDisplays(

    static getDisplays(

        adb: Adb,

        adb: Adb,

        path: string,

        path: string,

        version: string,

        options: AdbScrcpyOptions<object>,

        options: AdbScrcpyOptions<object>,

    ): Promise<ScrcpyDisplay[]> {

    ): Promise<ScrcpyDisplay[]> {

        options.setListDisplays();

        options.setListDisplays();

        return await options.getDisplays(adb, path, version);

        return options.getDisplays(adb, path);

    }

    }





    #options: AdbScrcpyOptions<object>;

    #options: AdbScrcpyOptions<object>;

libraries/adb-scrcpy/src/options/latest.ts

+1 −3
Original line number Original line Diff line number Diff line 
import { AdbScrcpyOptions2_1 } from "./2_1.js";

export { AdbScrcpyOptions2_1 as AdbScrcpyOptionsLatest } from "./2_1.js";
 


export class AdbScrcpyOptionsLatest extends AdbScrcpyOptions2_1 {}

libraries/adb-scrcpy/src/options/types.ts

+2 −10
Original line number Original line Diff line number Diff line
@@ -7,17 +7,9 @@ import type { AdbScrcpyConnection } from "../connection.js"; 
export abstract class AdbScrcpyOptions<

export abstract class AdbScrcpyOptions<

    T extends object,

    T extends object,

> extends ScrcpyOptionsWrapper<T> {

> extends ScrcpyOptionsWrapper<T> {

    abstract getEncoders(

    abstract getEncoders(adb: Adb, path: string): Promise<ScrcpyEncoder[]>;

        adb: Adb,

        path: string,

        version: string,

    ): Promise<ScrcpyEncoder[]>;





    abstract getDisplays(

    abstract getDisplays(adb: Adb, path: string): Promise<ScrcpyDisplay[]>;

        adb: Adb,

        path: string,

        version: string,

    ): Promise<ScrcpyDisplay[]>;





    abstract createConnection(adb: Adb): AdbScrcpyConnection;

    abstract createConnection(adb: Adb): AdbScrcpyConnection;

}
 
}

libraries/scrcpy/src/index.ts

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ export * from "./2_7/index.js"; 
export * from "./3_0/index.js";

export * from "./3_0/index.js";

export * from "./3_0_1.js";

export * from "./3_0_1.js";

export * from "./3_0_2.js";

export * from "./3_0_2.js";

export * from "./3_1/index.js";

export * from "./android/index.js";

export * from "./android/index.js";

export * from "./base/index.js";

export * from "./base/index.js";

export * from "./codec/index.js";

export * from "./codec/index.js";