Skip to content

Fix inconsistent usage of tabs and spaces #715

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.

Sign up for GitHub

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

Merged
Et0h merged 1 commit into from
Mar 26, 2025
Merged

Fix inconsistent usage of tabs and spaces #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 23 additions & 23 deletions ci/appimage-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ export LD_LIBRARY_PATH="$APPDIR"/usr/lib
export PATH="$PATH":"$APPDIR"/usr/bin

if [ "$1" == "--server" ]; then
exec "$APPDIR"/usr/bin/python "$APPDIR"/usr/bin/syncplay-server "${@:2}"
exec "$APPDIR"/usr/bin/python "$APPDIR"/usr/bin/syncplay-server "${@:2}"
else
exec "$APPDIR"/usr/bin/python "$APPDIR"/usr/bin/syncplay "$@"
exec "$APPDIR"/usr/bin/python "$APPDIR"/usr/bin/syncplay "$@"
fi
EAT
chmod +x AppRun.sh
Expand All @@ -75,24 +75,24 @@ mkdir -p AppDir/usr/share/metainfo/
cat > pl.syncplay.syncplay.appdata.xml <<\EAT
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>pl.syncplay.syncplay</id>
<metadata_license>MIT</metadata_license>
<project_license>Apache-2.0</project_license>
<name>Syncplay</name>
<summary>Client/server to synchronize media playback on mpv/VLC/MPC-HC/MPC-BE on many computers</summary>
<description>
<p>Syncplay synchronises the position and play state of multiple media players so that the viewers can watch the same thing at the same time. This means that when one person pauses/unpauses playback or seeks (jumps position) within their media player then this will be replicated across all media players connected to the same server and in the same 'room' (viewing session). When a new person joins they will also be synchronised. Syncplay also includes text-based chat so you can discuss a video as you watch it (or you could use third-party Voice over IP software to talk over a video).</p>
</description>
<launchable type="desktop-id">pl.syncplay.syncplay.desktop</launchable>
<url type="homepage">https://syncplay.pl/</url>
<screenshots>
<screenshot type="default">
<image>https://syncplay.pl/2019-05-26.png</image>
</screenshot>
</screenshots>
<provides>
<id>pl.syncplay.syncplay.desktop</id>
</provides>
<id>pl.syncplay.syncplay</id>
<metadata_license>MIT</metadata_license>
<project_license>Apache-2.0</project_license>
<name>Syncplay</name>
<summary>Client/server to synchronize media playback on mpv/VLC/MPC-HC/MPC-BE on many computers</summary>
<description>
<p>Syncplay synchronises the position and play state of multiple media players so that the viewers can watch the same thing at the same time. This means that when one person pauses/unpauses playback or seeks (jumps position) within their media player then this will be replicated across all media players connected to the same server and in the same 'room' (viewing session). When a new person joins they will also be synchronised. Syncplay also includes text-based chat so you can discuss a video as you watch it (or you could use third-party Voice over IP software to talk over a video).</p>
</description>
<launchable type="desktop-id">pl.syncplay.syncplay.desktop</launchable>
<url type="homepage">https://syncplay.pl/</url>
<screenshots>
<screenshot type="default">
<image>https://syncplay.pl/2019-05-26.png</image>
</screenshot>
</screenshots>
<provides>
<id>pl.syncplay.syncplay.desktop</id>
</provides>
</component>
EAT
mv pl.syncplay.syncplay.appdata.xml AppDir/usr/share/metainfo/
Expand All @@ -110,9 +110,9 @@ export OUTPUT=Syncplay-$VERSION-x86_64.AppImage
-e $(which readelf) \
-i "$REPO_ROOT"/syncplay/resources/syncplay.png -d pl.syncplay.syncplay.desktop \
--output appimage --custom-apprun AppRun.sh \
-l /usr/lib/x86_64-linux-gnu/libgthread-2.0.so.0 \
-l /usr/lib/x86_64-linux-gnu/libxkbcommon-x11.so.0 \
-l /usr/lib/x86_64-linux-gnu/libxcb.so.1 \
-l /usr/lib/x86_64-linux-gnu/libgthread-2.0.so.0 \
-l /usr/lib/x86_64-linux-gnu/libxkbcommon-x11.so.0 \
-l /usr/lib/x86_64-linux-gnu/libxcb.so.1 \
;

mv Syncplay*.AppImage "$OLD_CWD"
6 changes: 3 additions & 3 deletions syncplay/resources/lua/intf/syncplay.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ function do_command ( command, argument)
elseif command == "set-rate" then errormsg = set_var("rate", radixsafe_tonumber(argument))
elseif command == "set-title" then errormsg = set_var("title", radixsafe_tonumber(argument))
elseif command == "display-osd" then errormsg = display_osd(argument)
elseif command == "display-secondary-osd" then errormsg = display_secondary_osd(argument)
elseif command == "display-secondary-osd" then errormsg = display_secondary_osd(argument)
elseif command == "load-file" then response = load_file(argument)
elseif command == "close-vlc" then quit_vlc()
else errormsg = unknowncommand
Expand Down Expand Up @@ -561,7 +561,7 @@ end
while running == true do
--accept new connections and select active clients
local quitcheckcounter = 0
local fd = l:accept()
local fd = l:accept()
local buffer, inputbuffer, responsebuffer = "", "", ""
while fd >= 0 and running == true do

Expand Down Expand Up @@ -626,4 +626,4 @@ while running == true do

end

end
end
Loading
Loading