Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/screenshare with audio #346

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
e8b2018
Library added (node-pipewire:1.0.8)
kakxem Nov 15, 2022
64fb183
Audio and video section added
kakxem Nov 15, 2022
b1a236f
Screenshare with audio implemented
kakxem Nov 15, 2022
97f0f0f
Capturer with audio view created and old capturer files restored
kakxem Nov 16, 2022
1791321
Capturer files will be loaded based on your system
kakxem Nov 16, 2022
8e5bb25
screenShareAudio will be true if we can get nodes
kakxem Nov 16, 2022
33b2060
Fake module to replace node-pipewire created
kakxem Nov 17, 2022
45daf2a
Added scripts to enable and disable node-pipewire
kakxem Nov 17, 2022
437bba0
fake-module removed
kakxem Nov 18, 2022
da83fb7
enable/disable pipewire scripts removed and added node-pipewire to op…
kakxem Nov 18, 2022
e87f5b6
Optional dependencies in code implemented
kakxem Nov 21, 2022
58e3c6f
Library updated (node-pipewire:1.0.12)
kakxem Nov 23, 2022
0ab3338
The 'sleep' function has been replaced by 'waitForNewNode' function
kakxem Nov 23, 2022
6e20ea6
Library updated (node-pipewire:1.0.13)
kakxem Dec 13, 2022
2ab3a6e
removed unused vars and code refactor
kakxem Dec 13, 2022
fcad26b
Merge branch 'master' into feature/screenshare-with-audio
kakxem Dec 15, 2022
92504af
Merge branch 'master' into feature/screenshare-with-audio
kakxem Dec 17, 2022
e54fe1c
hope it works
ImUrX Dec 20, 2022
85fcd07
alr it works
ImUrX Dec 20, 2022
bb13f6f
fix eslint disable
ImUrX Dec 20, 2022
0e2f302
undo tsconfig fix
ImUrX Dec 20, 2022
2af7f28
import types
ImUrX Dec 20, 2022
c63a8f8
Merge pull request #2 from ImUrX/fix-import
kakxem Dec 20, 2022
66b5d6f
unlink new stereo ports from user audio
kakxem Dec 20, 2022
43057de
Merge branch 'master' into feature/screenshare-with-audio
kakxem Dec 20, 2022
54fa1bb
Fix type errors after merge.
SpacingBat3 Dec 20, 2022
48b1734
disable eslint in the native module import
kakxem Dec 20, 2022
65aa42a
Merge branch 'master' into feature/screenshare-with-audio
kakxem Jan 31, 2023
b974eff
Library updated (node-pipewire:1.0.14)
kakxem Jan 31, 2023
fc660c6
Typescript fixes
jim3692 Feb 1, 2023
40f092f
Remove audio button
IceDBorn Feb 2, 2023
5dc87df
Use discord's colors
IceDBorn Feb 2, 2023
2fd322e
Fix close button position
IceDBorn Feb 2, 2023
4b4ff2b
Change item positions
IceDBorn Feb 2, 2023
a297c8e
Switch to a list with scrollbar for sources
IceDBorn Feb 2, 2023
ddad86f
Remove useless tooltips
IceDBorn Feb 2, 2023
aff0703
Fix audio source text wrapping
IceDBorn Feb 2, 2023
90da80b
Fix broken icon on wayland video source
IceDBorn Feb 2, 2023
31edab3
Improve sources dialog ux
IceDBorn Feb 2, 2023
c456d3b
Add thumbnails for X11
IceDBorn Feb 2, 2023
d96e15a
Use spaces instead of tabs
IceDBorn Feb 2, 2023
e98aae9
feat: refresh sources in the selection view
kakxem Feb 2, 2023
1fa81a1
Merge branch 'feature/screenshare-with-audio' into screenshare-menu-o…
kakxem Feb 2, 2023
9b0c10f
Merge pull request #4 from IceDBorn/screenshare-menu-overhaul
kakxem Feb 2, 2023
433c21e
Merge pull request #3 from jim3692/fix-typescript
kakxem Feb 2, 2023
4ece3ca
fix: new eslint changes applied in getActualSources
kakxem Feb 2, 2023
e5c2ded
feat: sort audio sources
kakxem Feb 2, 2023
35d6b71
Merge branch 'master' into feature/screenshare-with-audio
kakxem Jun 25, 2023
e5d0650
Merge branch 'master' into feature/screenshare-with-audio
kakxem Oct 18, 2023
d4797af
Fix wayland loop popup at trying to screenshare
kakxem Oct 18, 2023
aea6bf7
Fix corrupted package-lock.json
kakxem Oct 19, 2023
c92aaa5
Merge branch 'master' into feature/screenshare-with-audio
kakxem Nov 7, 2023
391644f
chore: node-pipewire(1.0.15) lib updated
kakxem Nov 7, 2023
38df2a8
refactor: node-pipewire type imports
kakxem Nov 7, 2023
fbb35ac
Library updated (node-pipewire:1.0.16) and types added)
kakxem Nov 21, 2023
1575a8a
node-pipewire reimplemented
kakxem Nov 21, 2023
e1500c6
Update the lockfile
kakxem Nov 21, 2023
192f06a
Merge branch 'master' into feature/screenshare-with-audio
kakxem Nov 27, 2023
4578b35
Update the lockfile
kakxem Nov 27, 2023
00ecf70
Merge branch 'master' into feature/screenshare-with-audio
kakxem Jan 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
app/
node_modules/
cache/
.*
.*
3 changes: 3 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@
/*** Import plugin rules ***/
"import/no-unused-modules": ["error", {
"unusedExports": true
}],
"import/no-unresolved": ["error", {
"ignore": ["^(node:)?original-fs$"]
}]
}
}
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
node-version: latest
cache: npm

- name: Install dependencies
- name: Install dependencies (NPM)
run: npm ci

- name: Update dependencies
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
strategy:
fail-fast: false
matrix:
runner: [ubuntu-20.04, windows-latest, macos-latest]
name: ['Linux', 'Windows', 'macOS-x64', 'macOS-arm64']
build: [latest, locked]
include:
- runner: ubuntu-20.04
Expand All @@ -70,8 +70,11 @@ jobs:
name: Windows
arch: x64,arm64,ia32
- runner: macos-latest
name: macOS
arch: x64,arm64 #,universal
name: macOS-x64
arch: x64 #,arm64,universal
- runner: macos-latest
name: macOS-arm64
arch: arm64

name: '${{ matrix.name }} (${{ matrix.build }})'
runs-on: ${{ matrix.runner }}
Expand All @@ -83,8 +86,8 @@ jobs:
node-version: latest
cache: npm

- name: Install dependencies
run: npm ci ${{ matrix.name == 'macOS' && '&& npm i -D appdmg' || '' }}
- name: Install dependencies (NPM${{ matrix.name == 'macOS' && '+PIP' || '' }})
run: ${{ matrix.runner == 'macos-latest' && 'python -m pip install setuptools &&' || '' }} npm ci

- name: Update dependencies
if: ${{ matrix.build == 'latest' }}
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ jobs:
- name: Windows
runner: windows-latest
arch: x64,arm64,ia32
- name: macOS
- name: macOS-x64
runner: macos-latest
arch: x64,arm64 #,universal
arch: x64 #,arm64,universal
- name: macOS-arm64
runner: macos-latest
arch: arm64

name: ${{ matrix.name }} (${{ matrix.arch }})
runs-on: ${{ matrix.runner }}
Expand All @@ -33,8 +36,8 @@ jobs:
node-version: latest
cache: npm

- name: Install dependencies
run: npm ci ${{ matrix.name == 'macOS' && '&& npm i -D appdmg' || '' }}
- name: Install dependencies (NPM${{ matrix.name == 'macOS' && '+PIP' || '' }})
run: ${{ matrix.runner == 'macos-latest' && 'python -m pip install setuptools &&' || '' }} npm ci

- name: TSC cache
uses: actions/cache@v3
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ jobs:
- name: Windows
runner: windows-latest
arch: x64,arm64,ia32
- name: macOS
- name: macOS-x64
runner: macos-latest
arch: x64,arm64 #,universal
arch: x64 #,arm64,universal
- name: macOS-arm64
runner: macos-latest
arch: arm64

name: ${{ matrix.name }} (${{ matrix.arch }})
runs-on: ${{ matrix.runner }}
Expand All @@ -33,8 +36,8 @@ jobs:
node-version: latest
cache: npm

- name: Install dependencies
run: npm ci ${{ matrix.name == 'macOS' && '&& npm i -D appdmg' || '' }}
- name: Install dependencies (NPM${{ matrix.name == 'macOS' && '+PIP' || '' }})
run: ${{ matrix.runner == 'macos-latest' && 'python -m pip install setuptools &&' || '' }} npm ci

- name: TSC cache
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions docs/Features.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,6 @@ be done in the future in which case Chromium extensions might be deprecated
and / or removed.

You can load Chromium extensions by extracting them from `.crx` archive to
`{userData}/Extensions/Chromium/{extension name}/` folder.
`{userData}/Extensions/Chrome/{extension name}/` folder.

[chrome-ext]: https://www.electronjs.org/docs/latest/api/extensions "Chrome Extension Support | Electron's online documentation"
[chrome-ext]: https://www.electronjs.org/docs/latest/api/extensions "Chrome Extension Support | Electron's online documentation"
Loading
Loading