Tribler · ichorid · Sep 7, 2020 · Sep 7, 2020 · xoriole · Sep 7, 2020
diff --git a/build/debian/snap/snapcraft.yaml b/build/debian/snap/snapcraft.yaml
@@ -79,7 +79,6 @@ parts:
       - libxcb-icccm4
       - libxcb-image0
       - libxcb-render-util0
-      - vlc
       - libappindicator3-1
       - libasound2
       - libcurl3-gnutls
@@ -112,4 +111,4 @@ apps:
       - network-bind
       - unity7
       - pulseaudio
-      - network-manager
+      - network-manager
diff --git a/build/debian/tribler/DEBIAN/control b/build/debian/tribler/DEBIAN/control
@@ -5,7 +5,6 @@ Maintainer: Tribler Team <[email protected]>
 Homepage: https://www.tribler.org/
 Depends: libsodium23 | libsodium18 | libsodium13,
          libx11-6
-Recommends: vlc
 Description: Python based Bittorrent/Internet TV application
  It allows you to watch videos and download content. Tribler aims to combine
  the ease of Youtube.com with the performance of peer-to-peer.

diff --git a/build/win/makedist_win.bat b/build/win/makedist_win.bat
@@ -58,7 +58,7 @@ copy binary-LICENSE.txt dist\tribler
 mkdir dist\tribler\tools
 copy build\win\tools\reset*.bat dist\tribler\tools
 
-REM Laurens, 2016-04-20: Copy the redistributables of 2008, 2012 and 2015 and the VLC installer to the install dir
+REM Laurens, 2016-04-20: Copy the redistributables of 2008, 2012 and 2015 to the install dir
 REM Sandip, 2019-10-24: redistributables 2008, 2012 are not necessary anymore
 REM copy C:\build\vc_redist_110.exe dist\tribler
 copy C:\build\vc_redist_140.exe dist\tribler
@@ -71,15 +71,6 @@ REM copy C:\build\openssl\*.dll dist\tribler
 REM Copy missing dll files
 copy C:\build\missing_dlls\*.dll dist\tribler
 
-REM Copy VLC, different files based on 32-bit or 64-bit
-mkdir dist\tribler\VLC
-xcopy C:\build\vlc dist\tribler\VLC /s /e
-REM Make sure that there are no conflicting VLC DLLs in the Tribler root directory
-IF EXIST dist\tribler\libvlc.dll DEL /F dist\tribler\libvlc.dll
-IF EXIST dist\tribler\libvlccore.dll DEL /F dist\tribler\libvlccore.dll
-REM If there is a plugin cache (plugins.dat), remove it to avoid stale plugin warnings during runtime
-IF EXIST dist\tribler\VLC\plugins\plugins.dat DEL /F dist\tribler\VLC\plugins\plugins.dat
-
 
 @echo Running NSIS
 cd dist\tribler

diff --git a/doc/building/building_on_osx.rst b/doc/building/building_on_osx.rst
@@ -3,7 +3,6 @@ from the  `Development instructions <../development/development_on_osx.rst>`_.
 
 Required packages
 -------------------
-* vlc: PyInstaller automatically searches for the vlc library in the system and bundles it. 
 * eulagise: In order to attach the EULA to the ``.dmg`` file, we make use of the ``eulagise`` script. This script is written in PERL and is based on a more fully-featured script. The script can be downloaded from `GitHub <https://github.com/CompoFX/compo/blob/master/tool/eulagise.pl>`_. The builder expects the script to be executable and added to the ``PATH`` environment variable. This can be done with the following commands:
 
 .. code-block:: none

diff --git a/doc/building/building_on_windows.rst b/doc/building/building_on_windows.rst
@@ -26,10 +26,9 @@ Next, create a ``build`` folder directly on your ``C:\`` drive.
 Inside the ``build`` folder, put the following items:
 
 1. A folder ``certs`` containing a ``.pfx`` key. In our case it's named ``swarmplayerprivatekey.pfx``. Make sure to rename paths in ``makedist_win.bat`` to match your file name.
-2. A folder ``vlc`` that contains ``libvlc.dll``, ``libvlccore.dll`` and a directory ``plugins`` that contain the VLC plugins.
-3. ``vc_redist_110.exe`` (Visual C++ Redistributable for Visual Studio 2012), which is available `here <https://www.microsoft.com/en-us/download/details.aspx?id=30679>`__. In case you build 32 bit, get the x86 version. Once more, don't forget to rename the file.
-4. ``libsodium.dll`` which can be downloaded from `libsodium.org <https://download.libsodium.org/libsodium/releases/>`_ (as of writing version 1.0.8).
-5. The openssl dll files ``libeay32.dll``, ``libssl32.dll`` and ``ssleay32.dll`` (place them in a directory named ``openssl``).
+2. ``vc_redist_110.exe`` (Visual C++ Redistributable for Visual Studio 2012), which is available `here <https://www.microsoft.com/en-us/download/details.aspx?id=30679>`__. In case you build 32 bit, get the x86 version. Once more, don't forget to rename the file.
+3. ``libsodium.dll`` which can be downloaded from `libsodium.org <https://download.libsodium.org/libsodium/releases/>`_ (as of writing version 1.0.8).
+4. The openssl dll files ``libeay32.dll``, ``libssl32.dll`` and ``ssleay32.dll`` (place them in a directory named ``openssl``).
 
 Then, set a ``PASSWORD`` `environment variable <https://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/sysdm_advancd_environmnt_addchange_variable.mspx?mfr=true>`__ with its value set to the password matching the one set in your ``.pfx`` file.
 

diff --git a/doc/development/development_on_linux.rst b/doc/development/development_on_linux.rst
@@ -7,7 +7,7 @@ First, install the required dependencies by executing the following command in y
 
 .. code-block:: bash
 
-    sudo apt install git libssl-dev libx11-6 vlc libgmp-dev python3 python3-minimal python3-pip python3-libtorrent python3-pyqt5 python3-pyqt5.qtsvg python3-scipy
+    sudo apt install git libssl-dev libx11-6 libgmp-dev python3 python3-minimal python3-pip python3-libtorrent python3-pyqt5 python3-pyqt5.qtsvg python3-scipy
 
 Secondly, install python packages
 

diff --git a/doc/development/development_on_osx.rst b/doc/development/development_on_osx.rst
@@ -70,7 +70,6 @@ The best solution to this problem is to link or copy ``libsodium.dylib`` into th
     git clone --recursive  https://github.com/Tribler/tribler.git
     cd tribler
     cp /usr/local/lib/libsodium.dylib ./ || cp /opt/local/lib/libsodium.dylib ./
-    mkdir vlc
 
 You can now run Tribler by executing the following bash script in the ``src`` directory:
 

diff --git a/doc/development/development_on_windows.rst b/doc/development/development_on_windows.rst
@@ -53,10 +53,6 @@ Libsodium is required for the ``libnacl`` library, used for cryptographic operat
 
 Note that this might fail on Python 3.8, since directories have to be explicitly whitelisted to load DLLs from them. You can either copy the ``libsodium.dll`` to your ``System32`` directory or by whitelisting that directory using ``os.add_dll_directory`` when running Tribler.
 
-VLC
----
-
-To install VLC, you can download the official installer from the `VideoLAN website <http://www.videolan.org/vlc/download-windows.html>`_. Make sure to install the latest 64-bit version of VLC.
 
 Additional Packages
 -------------------

diff --git a/src/tribler-gui/tribler_gui/defs.py b/src/tribler-gui/tribler_gui/defs.py
@@ -9,18 +9,17 @@
 PAGE_EDIT_CHANNEL = 0
 PAGE_SEARCH_RESULTS = 1
 PAGE_SETTINGS = 2
-PAGE_VIDEO_PLAYER = 3
-PAGE_SUBSCRIBED_CHANNELS = 4
-PAGE_DOWNLOADS = 5
-PAGE_LOADING = 6
-PAGE_DISCOVERING = 7
-PAGE_DISCOVERED = 8
-PAGE_TRUST = 9
-PAGE_MARKET = 10
-PAGE_MARKET_TRANSACTIONS = 11
-PAGE_MARKET_WALLETS = 12
-PAGE_MARKET_ORDERS = 13
-PAGE_TRUST_GRAPH_PAGE = 14
+PAGE_SUBSCRIBED_CHANNELS = 3
+PAGE_DOWNLOADS = 4
+PAGE_LOADING = 5
+PAGE_DISCOVERING = 6
+PAGE_DISCOVERED = 7
+PAGE_TRUST = 8
+PAGE_MARKET = 9
+PAGE_MARKET_TRANSACTIONS = 10
+PAGE_MARKET_WALLETS = 11
+PAGE_MARKET_ORDERS = 12
+PAGE_TRUST_GRAPH_PAGE = 13
 
 PAGE_EDIT_CHANNEL_TORRENTS = 2
-Original file line number
+Diff line change
@@ Expand Up @@
     Note that this might fail on Python 3.8, since directories have to be explicitly whitelisted to load DLLs from them. You can either copy the ``libsodium.dll`` to your ``System32`` directory or by whitelisting that directory using ``os.add_dll_directory`` when running Tribler.
-    VLC
-    ---
-    To install VLC, you can download the official installer from the `VideoLAN website <http://www.videolan.org/vlc/download-windows.html>`_. Make sure to install the latest 64-bit version of VLC.
     Additional Packages
     -------------------
@@ Expand Down @@