Fixed Lbry.tv under AmigaOS 4 to use ffplay and not mplayer on video …

…playback
walkero-gr · Jul 15, 2020 · 1c85f61 · 1c85f61
1 parent 7388813
commit 1c85f61
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 31 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -10,37 +10,37 @@
       - cd /drone/src
       - mkdir aiostreams
       - mv ./docs ./aiostreams/
-    #   - mv ./simplejson ./aiostreams/
-    #   - mv ./*.py ./aiostreams/
-    #   - mv ./*.py.examples ./aiostreams/
-    #   - mv ./*.info ./aiostreams/
-    #   - mv ./*.md ./aiostreams/docs/
+      - mv ./simplejson ./aiostreams/
+      - mv ./*.py ./aiostreams/
+      - mv ./*.py.examples ./aiostreams/
+      - mv ./*.info ./aiostreams/
+      - mv ./*.md ./aiostreams/docs/
       - mv LICENSE ./aiostreams/docs/
       - lha -aq2o6 aiostreams-${DRONE_TAG}.lha aiostreams/
-#   - name: deploy-on-repo
-#     image: plugins/github-release
-#     settings:
-#       api_key:
-#         from_secret: GITHUB_RELEASE_API_KEY
-#       files:
-#         - "aiostreams-*.lha"
-#       title: "${DRONE_TAG} release"
-  - name: upload-to-ftp
-    image: cschlosser/drone-ftps
-    environment:
-      FTP_USERNAME:
-        from_secret: FTP_USERNAME
-      FTP_PASSWORD:
-        from_secret: FTP_PASSWORD
-      PLUGIN_HOSTNAME: walkero.duckdns.org:21
-      PLUGIN_DEST_DIR: /raid1/data/webserv_ftp/new
-      PLUGIN_SECURE: false
-      PLUGIN_VERIFY: false
-      PLUGIN_EXCLUDE: ^\[a-z,A-Z,0-9\]*\.\(pyc|py|info|yml|gitignore|git|md|vscode|examples|editorconfig\)$
+  - name: deploy-on-repo
+    image: plugins/github-release
+    settings:
+      api_key:
+        from_secret: GITHUB_RELEASE_API_KEY
+      files:
+        - "aiostreams-*.lha"
+      title: "${DRONE_TAG} release"
+#   - name: upload-to-ftp
+#     image: cschlosser/drone-ftps
+#     environment:
+#       FTP_USERNAME:
+#         from_secret: FTP_USERNAME
+#       FTP_PASSWORD:
+#         from_secret: FTP_PASSWORD
+#       PLUGIN_HOSTNAME: walkero.duckdns.org:21
+#       PLUGIN_DEST_DIR: /raid1/data/webserv_ftp/new
+#       PLUGIN_SECURE: false
+#       PLUGIN_VERIFY: false
+#       PLUGIN_EXCLUDE: ^\[a-z,A-Z,0-9\]*\.\(pyc|py|info|yml|gitignore|git|md|vscode|examples|editorconfig\)$
     #   PLUGIN_EXCLUDE: ^([a-z,A-Z,0-9]*.(pyc|py|info|yml|gitignore|git|md|vscode|examples|editorconfig)|docs|.editorconfig|http|LICENSE|simplejson)$
     #   PLUGIN_INCLUDE: ^\[a-z,A-Z,0-9\]*\.lha/$
 
   trigger:
     event:
       include:
-        - push
+        - tag
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 
 
+## [1.6.1] - 2020-07-15
+### Fixed
+- Fixed Lbry.tv under AmigaOS 4 to use ffplay and not mplayer on video playback
+
+
 ## [1.6] - 2020-07-13
 ### Added
 - Lbry.tv script added

diff --git a/cmn.py b/cmn.py
@@ -7,8 +7,8 @@
 except ImportError:
     pass
 
-aioVer = "1.6"
-aioReleaseDate = "2020-07-13"
+aioVer = "1.6.1"
+aioReleaseDate = "2020-07-15"
 userOS = sys.platform
 
 class cmnHandler:

diff --git a/docs/aiostreams.guide b/docs/aiostreams.guide
@@ -1,6 +1,6 @@
 @database "aiostreams.guide"
 @author "George (walkero) Sokianos"
-@$VER: 1.6 (2020-07-13)
+@$VER: 1.6.1 (2020-07-15)
 @wordwrap
 @node "MAIN" "aiostreams"
 @next "Requirements"
@@ -12,7 +12,7 @@
 /_/   \\_\\___\\___/|___/\\__|_|  \\___|\\__,_|_| |_| |_|___/
 
 @{b}All In One streams@{ub}
-@{i}v1.6 (2020-07-13)@{ui}
+@{i}v1.6.1 (2020-07-15)@{ui}
 @{jleft}@{lindent 3}@{rindent 3}
 All In One streams (aiostreams) is a pack of scripts, written in Python, that can be used to stream and watch videos from different online networks, like Twitch.tv and Mixer.com.
 
@@ -627,6 +627,9 @@ If you have any websites that you would like to be supported, please contact me
 @{jleft}@{lindent 3}
 @{b}Changelog@{ub}
 
+v1.6.1
+* Fixed Lbry.tv under AmigaOS 4 to use ffplay and not mplayer on video playback
+
 v1.6
 * Added Lbry.tv script
 * Cleared unused variables from scripts

diff --git a/lbrytv.py b/lbrytv.py
@@ -287,7 +287,7 @@ def main(argv):
         video = streams['result']['streaming_url']
         if (video):
             if cfg.autoplay:
-                cmnHandler.videoAutoplay(video, 'video')
+                cmnHandler.videoAutoplay(video, 'list')
         else:
             print "There is no video available!"