Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 11

xt7-player-mpv.changes Changed

xt7-player-mpv.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package xt7-player-mpv
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name: xt7-player-mpv
-Version: 0.22.391
+Version: 0.24.392
 Release: 0
 Summary: Qt/Gambas gui to mpv
 License: GPL-2.0+
@@ -40,18 +40,19 @@
 BuildRequires: gambas3-gb-image
 BuildRequires: gambas3-gb-image-imlib
 BuildRequires: gambas3-gb-image-io
+BuildRequires: gambas3-gb-libxml
 BuildRequires: gambas3-gb-net
 BuildRequires: gambas3-gb-net-curl
+BuildRequires: gambas3-gb-qt5
+BuildRequires: gambas3-gb-qt5-ext
 BuildRequires: gambas3-gb-settings
 BuildRequires: gambas3-gb-signal
 BuildRequires: gambas3-gb-util-web
 BuildRequires: gambas3-gb-web
-BuildRequires: gambas3-gb-libxml
+BuildRequires: pkgconfig
 BuildRequires: pkgconfig(taglib)
 BuildRequires: pkgconfig(taglib_c)
-# FIXME: Use %%requires_eq macro instead
 Requires: %(rpm -qf $(readlink -qne %{_libdir}/libtag.so) --qf '%{NAME} >= %{VERSION}')
-# FIXME: Use %%requires_eq macro instead
 Requires: %(rpm -qf $(readlink -qne %{_libdir}/libtag_c.so) --qf '%{NAME} >= %{VERSION}')
 Requires: ffmpeg
 Requires: gambas3-gb-args
@@ -66,15 +67,17 @@
 Requires: gambas3-gb-gtk
 Requires: gambas3-gb-gui
 Requires: gambas3-gb-image
+Requires: gambas3-gb-libxml
 Requires: gambas3-gb-net
 Requires: gambas3-gb-net-curl
+Requires: gambas3-gb-qt5
+Requires: gambas3-gb-qt5-ext
 Requires: gambas3-gb-settings
 Requires: gambas3-gb-signal
 Requires: gambas3-gb-util-web
 Requires: gambas3-gb-web
-Requires: gambas3-gb-libxml
-Requires: gambas3-runtime >= 3.8.4
-Requires: mpv >= 0.21.0
+Requires: gambas3-runtime
+Requires: mpv >= 0.24.0
 Requires: wget
 Requires: youtube-dl
 Recommends: dvb
@@ -83,17 +86,6 @@
 Recommends: xbindkeys
 Recommends: xdg-utils
 BuildArch: noarch
-%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120100
-BuildRequires: gambas3-gb-qt5
-BuildRequires: gambas3-gb-qt5-ext
-Requires: gambas3-gb-qt5
-Requires: gambas3-gb-qt5-ext
-%else
-BuildRequires: gambas3-gb-qt4
-BuildRequires: gambas3-gb-qt4-ext
-Requires: gambas3-gb-qt4
-Requires: gambas3-gb-qt4-ext
-%endif
 
 %description
 Aims to be an (in)complete graphical interface to mpv, focused on
@@ -104,11 +96,6 @@
 %prep
 %setup -q
 
-# Build with Qt4
-%if 0%{?suse_version} <= 1320 && !0%{?sle_version}
-sed -i 's/gb\.qt5/gb.qt4/' .project
-%endif
-
 %build
 gbc3 -e -a -g -t -p -m
 gba3

xt7-player-mpv-0.22.391.tar.gz/.lang/it.mo -> xt7-player-mpv-0.24.392.tar.gz/.lang/it.mo Changed

xt7-player-mpv-0.22.391.tar.gz/.lang/it.po -> xt7-player-mpv-0.24.392.tar.gz/.lang/it.po Changed

@@ -1,8 +1,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: xt7-player-mpv 3.9.1\n"
-"PO-Revision-Date: 2016-11-16 08:11 UTC\n"
+"Project-Id-Version: xt7-player-mpv 3.9.2\n"
+"PO-Revision-Date: 2017-02-14 09:15 UTC\n"
 "Last-Translator: kokoko3k <kokoko3k@gmail.com>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@
 msgid "Click for a list of URI prefixes"
 msgstr "Mostra la lista dei prefissi per le URI"
 
-#: AddUriForm.form:51 FMain.class:9036
+#: AddUriForm.form:51 FMain.class:9041
 msgid "cdda://"
 msgstr "-"
 
@@ -169,7 +169,7 @@
 msgid "Add the selected URI to Collection and/or Playlist"
 msgstr "Aggiungi l'URI selezionata alla collezione/playlist"
 
-#: AddUriForm.form:152 FMain.class:9526 GeneralOptions.form:1108
+#: AddUriForm.form:152 FMain.class:9534 GeneralOptions.form:1130
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -177,7 +177,7 @@
 msgid "Close"
 msgstr "Chiudi"
 
-#: AlbumView.class:94 FMain.class:1406
+#: AlbumView.class:94 FMain.class:1409
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -233,7 +233,7 @@
 msgid "Title"
 msgstr "Titolo"
 
-#: AudioConvert.class:95 FMain.class:10015
+#: AudioConvert.class:95 FMain.class:10024
 msgid "Unable to get the real stream url"
 msgstr "Non posso recuperare l'url reale del flusso"
 
@@ -305,19 +305,19 @@
 msgid "Start"
 msgstr "Avvia"
 
-#: AudioForm.class:13 FMain.form:691 FormLyrics.form:94 Searchfields.form:58
+#: AudioForm.class:13 FMain.form:692 FormLyrics.form:94 Searchfields.form:58
 msgid "Artist"
 msgstr "Artista"
 
-#: AudioForm.class:14 FMain.form:687 Searchfields.form:66
+#: AudioForm.class:14 FMain.form:688 Searchfields.form:66
 msgid "Album"
 msgstr "Album"
 
-#: AudioForm.class:15 FMain.form:2674 Searchfields.form:90
+#: AudioForm.class:15 FMain.form:2681 Searchfields.form:90
 msgid "Year"
 msgstr "Anno"
 
-#: AudioForm.class:17 FMain.form:2742 Searchfields.form:119
+#: AudioForm.class:17 FMain.form:2749 Searchfields.form:119
 msgid "Comment"
 msgstr "Commento"
 
@@ -325,7 +325,7 @@
 msgid "Lyrics"
 msgstr "Testi"
 
-#: AudioForm.class:29 FMain.form:2210
+#: AudioForm.class:29 FMain.form:2217
 msgid "Radio"
 msgstr "Radio"
 
@@ -333,11 +333,11 @@
 msgid "Name"
 msgstr "Nome"
 
-#: AudioForm.class:31 FMain.class:9025 Searchfields.form:104
+#: AudioForm.class:31 FMain.class:9030 Searchfields.form:104
 msgid "Length"
 msgstr "Durata"
 
-#: AudioForm.class:32 SubAndOsd.form:250
+#: AudioForm.class:32 SubAndOsd.form:249
 msgid "Size"
 msgstr "Dimensione"
 
@@ -355,7 +355,7 @@
 
 #: BugReport.form:29
 msgid "<center>Oops, xt7 just crashed. </center>\n\nYou can this window to exit the program or submit a bug report \nby using one of the following choices: \n \n&nbsp; xt7 forums on sourceforge.net: \n&nbsp;&nbsp; &bull; free posting without the need to register \n \n&nbsp; xt7 project page on GitHub.com: \n&nbsp;&nbsp; &bull; requires an account to post \n&nbsp;&nbsp; &bull; much better bug managment. \n"
-msgstr ""
+msgstr "-\n"
 
 #: BugReport.form:48
 msgid "When you submit a bug report, please write what you were doing when the crash happened and include the following in your report."
@@ -377,7 +377,7 @@
 msgid ":"
 msgstr "-"
 
-#: ChooseAspect.form:53 GeneralOptions.form:2427
+#: ChooseAspect.form:53 GeneralOptions.form:2470
 msgid "="
 msgstr "-"
 
@@ -390,10 +390,10 @@
 msgstr "Test"
 
 #: CountDown.form:12
-msgid "ShutDown CountDown..."
-msgstr "Conto alla rovescia per lo spegnimento."
+msgid "ShutDown CountDown"
+msgstr "Conto alla rovescia per lo spegnimento"
 
-#: CountDown.form:17 NewChains.class:548
+#: CountDown.form:17 NewChains.class:560
 msgid "Abort"
 msgstr "Annulla"
 
@@ -401,9 +401,9 @@
 msgid "ShutDown in"
 msgstr "Spegnimento in"
 
-#: CountDown.form:32
-msgid "seconds..."
-msgstr "secondi..."
+#: CountDown.form:32 GeneralOptions.form:1631
+msgid "seconds"
+msgstr "secondi"
 
 #: CountDown.form:38
 msgid "10"
@@ -429,19 +429,19 @@
 msgid "Try to use less strict terms, remove symbols and so on..."
 msgstr "Prova ad usare termini meno stretti, rimuovi i simboli e così via..."
 
-#: CoverManager.class:941
+#: CoverManager.class:944
 msgid "Load a Jpg cover image"
 msgstr "Carica una copertina in formato jpg"
 
-#: CoverManager.class:957
+#: CoverManager.class:960
 msgid "Error while loading the picture"
 msgstr "Errore durante il caricamento dell' immagine"
 
-#: CoverManager.class:991 FMain.class:7945
+#: CoverManager.class:994 FMain.class:7950
 msgid "\nso you are going to set a cover for this particular file/stream"
 msgstr "\nQuindi la copertina che imposterai sarà solo per questo file o stream"
 
-#: CoverManager.class:992 FMain.class:7946
+#: CoverManager.class:995 FMain.class:7951
 msgid "Artist Or Album tag information are required to set a cover"
 msgstr "Le tag artista o album sono necessarie per impostare una copertina"
 
@@ -473,11 +473,11 @@
 msgid "Load cover"
 msgstr "Carica da disco"
 
-#: CoverManager.form:178 GeneralOptions.form:3140
+#: CoverManager.form:178 GeneralOptions.form:3184
 msgid "128"
 msgstr "-"
 
-#: CoverManager.form:178 GeneralOptions.form:3140
+#: CoverManager.form:178 GeneralOptions.form:3184
 msgid "160"
 msgstr "-"
 
@@ -505,7 +505,7 @@
 msgid "Set Cover"
 msgstr "Imposta"
 
-#: DVBTuner.class:53 FMain.form:1763 GeneralOptions.form:1447
+#: DVBTuner.class:53 FMain.form:1770 GeneralOptions.form:1504
 msgid "DVB-T"
 msgstr "-"
 
@@ -521,7 +521,7 @@
 msgid "Too bad..."
 msgstr "Peccato..."
 
-#: DVBTuner.form:37 FMain.form:913
+#: DVBTuner.form:37 FMain.form:914
 msgid "Simple Dvb-T Tuner"
 msgstr "Semplice tuner DVB-T"
 
@@ -549,11 +549,11 @@
 msgid "Import"
 msgstr "Importa"
 
-#: DVBTuner.form:95 GeneralOptions.form:1982

xt7-player-mpv-0.22.391.tar.gz/.list -> xt7-player-mpv-0.24.392.tar.gz/.list Changed

xt7-player-mpv-0.22.391.tar.gz/.project -> xt7-player-mpv-0.24.392.tar.gz/.project Changed

xt7-player-mpv-0.22.391.tar.gz/.settings -> xt7-player-mpv-0.24.392.tar.gz/.settings Changed

@@ -2,7 +2,11 @@
 Count=0
 
 [DebugWindow]
-Count=0
+Count=1
+DebugWindow[1]="devices"
+
+[DebugWindow/(Dir(Directory, "*"))]
+Geometry=[1280,0,224,280]
 
 [DebugWindow/AComment]
 Geometry=[1280,0,224,280]
@@ -13,6 +17,9 @@
 [DebugWindow/Last]
 Geometry=[108,296,561,513]
 
+[DebugWindow/Matches]
+Geometry=[1280,0,224,280]
+
 [DebugWindow/NewChains.parse_drivers(False)]
 Geometry=[1280,0,224,280]
 
@@ -43,30 +50,81 @@
 [DebugWindow/TabStrip_filters_audio.Current.Children[0]]
 Geometry=[94,42,239,516]
 
+[DebugWindow/TheForm]
+Geometry=[1280,0,433,529]
+
 [DebugWindow/TheForm.controls]
 Geometry=[52,0,224,280]
 
 [DebugWindow/TheTabStrip]
 Geometry=[1280,0,224,280]
 
+[DebugWindow/aArg]
+Geometry=[1280,0,224,280]
+
+[DebugWindow/aSign]
+Geometry=[1280,0,224,280]
+
 [DebugWindow/aTabstrip]
 Geometry=[52,0,224,280]
 
+[DebugWindow/aTabstrip.Tag]
+Geometry=[52,0,224,280]
+
 [DebugWindow/data]
 Geometry=[1280,0,224,280]
 
+[DebugWindow/devices]
+Geometry=[52,0,224,280]
+
 [DebugWindow/driver_opts]
 Geometry=[1280,0,224,280]
 
 [DebugWindow/driver_opts[0]]
 Geometry=[1280,312,224,280]
 
+[DebugWindow/forbackground]
+Geometry=[52,0,224,280]
+
+[DebugWindow/hClass]
+Geometry=[1335,369,224,280]
+
+[DebugWindow/hClass.Symbols]
+Geometry=[1280,440,224,280]
+
+[DebugWindow/hClass[sSymbol]]
+Geometry=[609,499,377,337]
+
+[DebugWindow/hsplit1.Layout]
+Geometry=[400,147,224,280]
+
+[DebugWindow/hsplit1.layout]
+Geometry=[400,147,224,280]
+
+[DebugWindow/i]
+Geometry=[52,0,224,280]
+
+[DebugWindow/image.Load(tmpfile)]
+Geometry=[52,0,224,280]
+
+[DebugWindow/img]
+Geometry=[298,0,224,280]
+
+[DebugWindow/img.picture]
+Geometry=[1280,0,224,280]
+
 [DebugWindow/jdec]
 Geometry=[596,177,265,356]
 
 [DebugWindow/jdec["default-value"]]
 Geometry=[1294,14,224,280]
 
+[DebugWindow/jdecoded]
+Geometry=[52,0,224,280]
+
+[DebugWindow/jdecoded[0]]
+Geometry=[66,14,224,280]
+
 [DebugWindow/last_dynaobj_changed]
 Geometry=[688,443,224,280]
 
@@ -94,12 +152,21 @@
 [DebugWindow/myscrollview]
 Geometry=[666,279,224,280]
 
+[DebugWindow/mystream]
+Geometry=[52,0,224,280]
+
 [DebugWindow/names]
 Geometry=[1280,0,224,280]
 
 [DebugWindow/new_opts]
 Geometry=[1280,0,581,744]
 
+[DebugWindow/o]
+Geometry=[52,0,378,804]
+
+[DebugWindow/o.Parent]
+Geometry=[66,14,378,804]
+
 [DebugWindow/obj]
 Geometry=[52,0,283,308]
 
@@ -145,15 +212,27 @@
 [DebugWindow/opts["vo"]]
 Geometry=[1280,0,224,280]
 
+[DebugWindow/out]
+Geometry=[1280,0,224,280]
+
 [DebugWindow/out_bands]
 Geometry=[52,0,224,280]
 
+[DebugWindow/prevlayout]
+Geometry=[400,147,224,280]
+
 [DebugWindow/prop]
 Geometry=[1280,0,224,280]
 
 [DebugWindow/properties]
 Geometry=[1280,0,224,280]
 
+[DebugWindow/prova]
+Geometry=[1280,0,224,280]
+
+[DebugWindow/prova[0]]
+Geometry=[1294,14,224,280]
+
 [DebugWindow/return_opts]
 Geometry=[1280,0,224,280]
 
@@ -178,25 +257,46 @@
 [DebugWindow/theobject]
 Geometry=[52,0,224,848]
 
+[DebugWindow/tmppic]
+Geometry=[52,0,224,280]
+
+[DebugWindow/tmppic.Image]
+Geometry=[52,312,224,280]
+
 [Executable]
 Path="xt7-player-mpv.gambas"
 
 [OpenFile]
-File[1]=".src/Classi/IceCastClass.class:20.60"
-File[2]=".src/Classi/MplayerClass.class:0.2404"
-Active=3
-File[3]=".src/Form/NewChains.class:12.1910"
-Count=13
+File[1]=".src/Classi/IceCastClass.class:62.197"
+File[2]=".src/Classi/MplayerClass.class:6.2609"
+Active=7
+File[3]=".src/Form/NewChains.class:0.2223"
+Count=28
 File[4]=".src/Form/FMain.form"
-File[5]=".src/Form/FMain.class:25.1529"
+File[5]=".src/Form/FMain.class:21.11263"
 File[6]=".src/Form/NewChains.form"
-File[7]=".src/Form/GeneralOptions.class:24.111"
-File[8]=".src/0_Moduli/Global.module:26.665"
+File[7]=".src/Form/GeneralOptions.class:19.1608"
+File[8]=".src/0_Moduli/Global.module:0.772"
 File[9]=".src/Form/GeneralOptions.form"
 File[10]=".src/Classi/FloatSpinBox.class:12.180"
-File[11]="AA_ToDo:1.10"
+File[11]="AA_ToDo:0.44"
 File[12]=".src/Classi/randr.class:0.165"
-File[13]=".src/Classi/SettingsClass.class:31.142"
+File[13]=".src/Classi/SettingsClass.class:0.293"
+File[14]=".src/Form/ChooseAspect.class:17.21"
+File[15]=".src/Classi/PlaylistClass.class:24.905"
+File[16]=".src/Form/HotKeys.class:3.292"
+File[17]=".src/Form/zzzFake.form"
+File[18]=".src/Classi/StartClass.class:32.55"
+File[19]=".src/Form/zzzFake.class:48.13"

xt7-player-mpv-0.22.391.tar.gz/.src/0_Moduli/Global.module -> xt7-player-mpv-0.24.392.tar.gz/.src/0_Moduli/Global.module Changed

xt7-player-mpv-0.22.391.tar.gz/.src/Classi/DbusProperties.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Classi/DbusProperties.class Changed

xt7-player-mpv-0.22.391.tar.gz/.src/Classi/MplayerClass.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Classi/MplayerClass.class Changed

@@ -1191,7 +1191,7 @@
 
 Public Function IsSubFile(SubfilePath As String) As Boolean
 
- Dim SubExtensions As String = "*.SRT;*.ASS;*.SUB;*.SSA;"
+ Dim SubExtensions As String = "*.SRT;*.ASS;*.SUB;*.SSA;*.SCC"
 Dim fileExt As String = "." & File.Ext(SubfilePath)
 
 If Fileext = "." Then Return False
@@ -1445,7 +1445,7 @@
 'Create the thumb, but exit after 30 seconds 
 cmdline = executable(5) & " " & Shell(fullpath) & " --cache=no "
 cmdline &= "-vf scale=" & width & ":-2" & ",expand=::::1/1" & " --no-sub" & " --start " & seconds 
- cmdline &= " -frames 1 --no-audio --vo=image:format=jpg:jpeg-quality=80:outdir=" & outdir
+ cmdline &= " -frames 1 --no-audio --vo=image --vo-image-format=jpg --vo-image-jpeg-quality=80 --vo-image-outdir=" & outdir
 cmdline &= " --config=no -quiet &>/dev/null"
 
 newfilenamepriv = newfilename
@@ -2343,8 +2343,10 @@
 
 If af_current <> af_new Then 
 af_new = fix_for_anequalizer(af_new)
+ af_new = fix_for_compand(af_new)
 set_property_mpv("af", af_new, True)
 af_current = af_new
+ File.Save("/tmp/out.txt", af_new)
 Endif
 
 ReturnLabel:
@@ -2352,6 +2354,23 @@
 
 End
 
+Private Function fix_for_compand(af As String) As String
+ Dim istart, iend As Integer
+ Dim sOut As String
+
+' "lavfi=[compand=" & eqstring(False) & ]" this way it works in realtime only
+' lavfi=[compand=" & eqstring(False) & "] this way it works at start
+ istart = InStr(af, "\"lavfi=[compand")
+ 
+ If istart = 0 Then Return af
+
+ iend = InStr(af, "]\"", istart)
+ If iend = 0 Then Return af 'something wrong...
+ sOut = Left(af, istart - 1) & Mid(af, istart + 1, iend - Len(af)) & Right(af, - iend - 1)
+
+ Return sout
+End
+
 Private Function fix_for_anequalizer(af As String) As String
 Dim istart, iend As Integer
 Dim sOut As String
@@ -2362,7 +2381,7 @@
 
 If istart = 0 Then Return af
 
- iend = InStr(af, "]\"")
+ iend = InStr(af, "]\"", istart)
 If iend = 0 Then Return af 'something wrong...
 sOut = Left(af, istart - 1) & Mid(af, istart + 1, iend - Len(af)) & Right(af, - iend - 1)
 
@@ -2565,3 +2584,30 @@
 Public Function audio_add(filename As String)
 mpv_command(["audio-add", filename])
 End
+
+Public Function get_offline_property(p As String) As String
+ Dim out As String
+ Dim cmd As String
+ cmd = "echo -e print_text '${" & p & "} \n quit' | " & executable(5) & " --idle=yes --input-file=/dev/stdin" 
+ Shell cmd To out
+ Return out
+End
+
+Public Function audio_devices_list(Optional separator As String = " ~ ") As String[]
+ Dim devices As New String[]
+ Dim j, name, desc As String 
+ Dim jdecoded As New Collection[]
+ Dim i As Integer
+ j = get_offline_property("=audio-device-list")
+ If Trim(j) = "" Then Return Null
+ Try jdecoded = json.Decode(j)
+ If Error Then Return Null
+ If jdecoded.count = 0 Then Return Null
+ For i = 0 To jdecoded.max
+ name = jdecoded[i]["name"]
+ desc = jdecoded[i]["description"]
+ devices.Add(name & separator & desc)
+ Next
+ Return devices
+End
+

xt7-player-mpv-0.22.391.tar.gz/.src/Classi/MplayerClass_old.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Classi/MplayerClass_old.class Changed

xt7-player-mpv-0.22.391.tar.gz/.src/Classi/mpris.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Classi/mpris.class Changed

@@ -4,25 +4,25 @@
 
 Inherits DBusObject
 
+
 Create Static
+' Event org_freedesktop_DBus_Properties_PropertiesChanged(args As String[])
 
 
-''org.freedesktop.Dbus.Introspectable-------------------------------------------------------------------------------------------------------------
+Public Sub emit_propertychanged()
+' Dim args As New Collection[]
+' Dim prova As New String[]
 ' 
-' Public Function org_freedesktop_Dbus_Introspectable_Introspect() As String
-' Return "NULL"
-' End
 ' 
-' ''org.freedesktop.Dbus.Properties-----------------------------------------------------------------------------------------------------------------
-' Public Function org_freedesktop_Dbus_Properties_Get(Myinterface As String, MyProperty As String) As String
-' Return "NULL"
-' End
-' Public Function org_freedesktop_Dbus_Properties_Set(Myinterface As String, MyProperty As String) As String
-' Return "NULL"
-' End
-' Public Function org_freedesktop_Dbus_Properties_GetAll(Myinterface As String, MyProperty As String) As String[]
-' Return "NULL"
-' End
+' 'prova.add(org_mpris_MediaPlayer2_Player_Metadata_Read())
+' prova.Add("a")
+' Debug "a"
+' Debug prova[0] 
+' Debug "a"
+' 'type mismatch?
+' DBus["/org/mpris/MediaPlayer2"].Raise(mpris, "org.freedesktop.DBus.Properties.PropertiesChanged", prova)
+
+End
 
 
 ''ORG.MPRIS.MEDIAPLAYER2-----------------------------------------------------------------------------------------------------------------
@@ -35,38 +35,47 @@
 Property Read org_mpris_MediaPlayer2_SupportedMimeTypes As String[]
 
 Function org_mpris_MediaPlayer2_CanQuit_Read() As Boolean
+ 'debug "Dbus"
 Return True
 End
 
 Function org_mpris_MediaPlayer2_CanRaise_Read() As Boolean
+ 'debug "Dbus"
 Return True
 End
 
 Function org_mpris_MediaPlayer2_HasTrackList_Read() As Boolean
+ 'debug "Dbus"
 Return True
 End
 
 Function org_mpris_MediaPlayer2_Identity_Read() As String
- Return "xt7-player"
+ 'debug "Dbus"
+ Return "xt7-player-mpv"
 End
 
 Function org_mpris_MediaPlayer2_DesktopEntry_Read() As String
- Return "xt7-player"
+ 'debug "Dbus"
+ Return "xt7-player-mpv"
 End
 
 Function org_mpris_MediaPlayer2_SupportedUriSchemes_Read() As String[]
+ 'debug "Dbus"
 Return ["file", "http"]
 End
 
 Function org_mpris_MediaPlayer2_SupportedMimeTypes_Read() As String[]
+ 'debug "Dbus"
 Return ["application/ogg", "application/x-ogg", "application/x-ogm-audio", "audio/aac", "audio/mp4", "audio/mpeg", "audio/mpegurl", "audio/ogg", "audio/vnd.rn-realaudio", "audio/vorbis", "audio/x-flac", "audio/x-mp3", "audio/x-mpeg", "audio/x-mpegurl", "audio/x-ms-wma", "audio/x-musepack", "audio/x-oggflac", "audio/x-pn-realaudio", "audio/x-scpls", "audio/x-speex", "audio/x-vorbis", "audio/x-vorbis+ogg", "audio/x-wav", "video/x-ms-asf", "x-content/audio-player"]
 End
 
 Public Function org_mpris_MediaPlayer2_Raise() 
- FMain.raise
+ 'debug "Dbus"
+ FMain.Show()
 End
 
 Public Function org_mpris_MediaPlayer2_Quit()
+ 'debug "Dbus"
 'we cannot just quit the application, because it would unregister
 'dbus before we exit this kifunction, leading to a runtime error
 'so use a timer to program a delayed quit.
@@ -78,7 +87,7 @@
 Property org_mpris_MediaPlayer2_Player_LoopStatus As String
 Property org_mpris_MediaPlayer2_Player_Rate As Float
 Property org_mpris_MediaPlayer2_Player_Shuffle As Boolean
-Property Read org_mpris_MediaPlayer2_Player_Metadata As String[] 'controllare bene il tipo di dato
+Property Read org_mpris_MediaPlayer2_Player_Metadata As Collection
 Property org_mpris_MediaPlayer2_Player_Volume As Float
 Property Read org_mpris_MediaPlayer2_Player_Position As Long
 Property Read org_mpris_MediaPlayer2_Player_MinimumRate As Float
@@ -92,9 +101,16 @@
 
 
 Function org_mpris_MediaPlayer2_Player_PlayBackStatus_Read() As String
+ Dim processrunning As Boolean = False
+ 'debug "Dbus"
+ Try processrunning = FMain.mplayer.ProcessRunningOvr() 
+ If Not processrunning Then Return "Stopped"
+ If FMain.mplayer.paused(True) Then Return "Paused"
+ Return "Playing"
 End
 
 Function org_mpris_MediaPlayer2_Player_LoopStatus_Read() As String
+'debug "Dbus"
 If FMain.TogglePls.value Then 
 Return "Playlist"
 Else
@@ -103,79 +119,121 @@
 End
 
 Function org_mpris_MediaPlayer2_Player_LoopStatus_Write(p As String)
+'debug "Dbus"
 FMain.TogglePls.value = (p = "Playlist")
 End
 
 Function org_mpris_MediaPlayer2_Player_Rate_Read() As Float
+ Dim out As String
+ Dim fout As Float
+ 'debug "Dbus"
+ If Not FMain.mplayer.ProcessRunningOvr() Then Return 1
+ out = FMain.mplayer.get_property_mpv("speed",,, True)
+ Try fout = CFloat(out)
+ If Not Error Then Return fout
+ Return 1
 End
 
 Function org_mpris_MediaPlayer2_Player_Rate_Write(p As Float) 
+ 'debug "Dbus"
 End
 
 Function org_mpris_MediaPlayer2_Player_Shuffle_Read() As Boolean
+ 'debug "Dbus"
 Return FMain.ShufflePls.value
 End
 
 Function org_mpris_MediaPlayer2_Player_Shuffle_Write(p As Boolean) 
+ 'debug "Dbus"
 FMain.ShufflePls.value = p
 End
 
-Function org_mpris_MediaPlayer2_Player_Metadata_Read() As String[]
+Function org_mpris_MediaPlayer2_Player_Metadata_Read() As Collection
+ Dim out As Collection
+ 
+ out = New Collection
+ out["xesam:url"] = "/my/track_" & CString(Rnd(0, 10000)) 'FMain.mplayer.getP("fullpath")
+ out["mpris:trackid"] = "/path/to/dbus/boh" 'probably wrong type, should be "objectpath"
+
+ If FMain.mplayer.ProcessRunningOvr() Then 
+ Try out["mpris:length"] = CLong(FMain.mplayer.get_property_mpv("=duration", True, 1, True) * 1000000)
+ Endif
+ 
+ Return out
+
 End
 
 Function org_mpris_MediaPlayer2_Player_Volume_Read() As Float
+'debug "Dbus"
 Return (FMain.SaveVolumeSlider.value * (100 Div FMain.SaveVolumeSlider.MaxValue))
 End
 
-Function org_mpris_MediaPlayer2_Player_Volume_Write(p As Float)
- If p <= 0 Then
- FMain.volume_set("0")
- Else
- FMain.volume_set(CStr(p * 100))
- Endif
-End
+
 
 Function org_mpris_MediaPlayer2_Player_Position_Read() As Long
+ 'debug "Dbus"
+ If Not (FMain.mplayer.ProcessRunningOvr()) Then Return
+ Return FMain.mplayer.CurrentTime(True) * 1000000
 End
 
 Function org_mpris_MediaPlayer2_Player_Position_Write() As Long
+'debug "Dbus"
 End
 
 Function org_mpris_MediaPlayer2_Player_MinimumRate_Read() As Float
+ Return "0.01"
+'debug "Dbus"
 End
 
 Function org_mpris_MediaPlayer2_Player_MaximumRate_Read() As Float
+ Return "1000"
+'debug "Dbus"
 End

xt7-player-mpv-0.22.391.tar.gz/.src/Form/CountDown.form -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/CountDown.form Changed

xt7-player-mpv-0.22.391.tar.gz/.src/Form/CoverManager.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/CoverManager.class Changed

@@ -665,18 +665,18 @@
 End
 
 Public Function LookForJpg(filename As String, Optional saveto As String = "", Optional ByRef fileerror As Boolean = False) As Boolean
-   Dim mystream As File
-   Dim myjpg As String = ""
-   Dim m1 As String = "image/"
-   Dim isvalid As Boolean = False
-   Dim tmpfile As String = Temp & ".jpg"
-   Dim tmppic As Picture
-   Dim chunk As String
-   Dim m1pos As Long
-   Dim jpgstartmarker As String = Chr(255) & Chr(216) 'FFD8
-   Dim jpgendmarker As String = Chr(255) & Chr(217)   'FFD9
-   Dim jpgstart, jpgend As Long
-   
+  Dim mystream As File
+  Dim myjpg As String = ""
+  Dim m1 As String = "image/"
+  Dim isvalid As Boolean = False
+  Dim tmpfile As String = Temp & ".jpg"
+  Dim tmppic As Picture
+  Dim chunk As String
+  Dim m1pos As Long
+  Dim jpgstartmarker As String = Chr(255) & Chr(216) 'FFD8
+  Dim jpgendmarker As String = Chr(255) & Chr(217)   'FFD9
+  Dim jpgstart, jpgend As Long
+
   If IsUncovered(filename) Then Return False
 
   Try mystream = Open filename For Input
@@ -716,9 +716,10 @@
 
     myjpg = Read #mystream, (jpgend - jpgstart) 
     file.Save(tmpfile, myjpg)
-    Try tmppic = picture.Load(tmpfile)
+    Try tmppic = image.Load(tmpfile).picture
     If Not Error Then 
       isvalid = True
+      Stop
       Seek #mystream, jpgstart
         Else
       Seek #mystream, jpgend
@@ -797,6 +798,8 @@
     Seek #mystream, jpgstart
 
     myjpg = Read #mystream, (jpgend - jpgstart) 
+    Stop
+    
     file.Save(tmpfile, myjpg)
     Try tmppic = picture.Load(tmpfile)
     If Not Error Then 
@@ -1205,8 +1208,11 @@
 
 
   For Each sFile In (Dir(Directory, "*"))
+
+    If sFile Like "*.png" Then Stop
     For Each sMatch In Matches
       If sFile Like sMatch Then 
+        
         folderpictures.Add(sFile, directory)
         Return sFile
       Endif
@@ -1218,15 +1224,16 @@
 End
 
 
-
 Public Sub EmbeddedToCoverCache(artist As String, album As String, fullpath As String, coverfilename As String, mygrid As Gridview, row As Integer, column As Integer)
   Select Case Lower(file.Ext(fullpath))
     Case "mp3"
-      LookForJpg(fullpath, coverfilename)
-      Try mygrid[row, column].text = ""
-      Try mygrid[row, column].clear
+      makevideothumb(fullpath, coverfilename, mygrid, row, column, 1)
+      'LookForJpg(fullpath, coverfilename)
+      'Try mygrid[row, column].text = ""
+      'Try mygrid[row, column].clear
       Return
     Case "ogg"
+      LookForJpg(fullpath, coverfilename)
       If LookForJpgb64(fullpath, coverfilename) Then 
         Try mygrid[row, column].text = ""
         Try mygrid[row, column].clea
@@ -1265,7 +1272,7 @@
 
 
 Private lastthumbpath As String = ""
-Public Sub makevideothumb(fullpath As String, coverfilepath As String, mygrid As Gridview, row As Integer, column As Integer)
+Public Sub makevideothumb(fullpath As String, coverfilepath As String, mygrid As Gridview, row As Integer, column As Integer, Optional seconds As Integer = 300)
   If fullpath = lastthumbpath Then Return
   lastthumbpath = fullpath
 
@@ -1278,7 +1285,7 @@
   mplayerthumb = New Mplayerclass As "thumbnailer"
   runningthumblers += 1
   global.myDebug(runningthumblers)
-  mplayerthumb.savethumb(fullpath, coverfilepath,,, mygrid, row, column)
+  mplayerthumb.savethumb(fullpath, coverfilepath,, seconds, mygrid, row, column)
 End
 
 
@@ -1290,6 +1297,7 @@
    g.refresh
    Wait
   global.myDebug(runningthumblers)
+  UnMarkUncovered(fullpath)
 End
 
 Public Sub thumbnailer_ThumbErrorFor(fullpath As String, g As Gridview, r As Integer, c As Integer)

xt7-player-mpv-0.22.391.tar.gz/.src/Form/CoverManager.form -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/CoverManager.form Changed

xt7-player-mpv-0.22.391.tar.gz/.src/Form/EpgForm.form -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/EpgForm.form Changed

@@ -45,15 +45,11 @@
         MoveScaled(25,0,3,3)
         Expand = True
       }
-      { Timer1 #Timer
-        #MoveScaled(30,2)
-        Delay = 1
-      }
       { Panel2 Panel
         MoveScaled(38,1,48,5.7143)
         AutoResize = True
         { ClockLabel2 TextLabel
-          MoveScaled(-7.2857,0.2857,54,5.7143)
+          MoveScaled(-8.2857,0.2857,54,5.7143)
           Font = Font["Bold,18"]
           Foreground = &H000000&
           AutoResize = True
@@ -71,6 +67,10 @@
           Transparent = True
         }
       }
+      { Timer1 #Timer
+        #MoveScaled(30,2)
+        Delay = 1
+      }
     }
     { Separator2 Separator
       MoveScaled(36,12,53,2)
@@ -106,41 +106,6 @@
           Background = &H6992AE&
         }
       }
-      { InfoPanelShadow PictureBox
-        MoveScaled(24,7,38,35)
-        Visible = False
-        Ignore = True
-        Picture = Picture["shadowframe.png"]
-        Stretch = True
-      }
-      { pictureshadelow PictureBox Pictureshade
-        Name = "pictureshadelow"
-        MoveScaled(22,35,54,9)
-        Ignore = True
-        Picture = Picture["shadelowEPG.png"]
-        Stretch = True
-      }
-      { pictureshadeleft PictureBox Pictureshade
-        Name = "pictureshadeleft"
-        MoveScaled(22,-4,7,48)
-        Ignore = True
-        Picture = Picture["shadeleft.png"]
-        Stretch = True
-      }
-      { pictureshaderight PictureBox Pictureshade
-        Name = "pictureshaderight"
-        MoveScaled(69,-4,7,48)
-        Ignore = True
-        Picture = Picture["shaderight.png"]
-        Stretch = True
-      }
-      { pictureshadeup PictureBox Pictureshade
-        Name = "pictureshadeup"
-        MoveScaled(22,1,54,9)
-        Ignore = True
-        Picture = Picture["shadeupEPG.png"]
-        Stretch = True
-      }
       { InfoPanel Panel MyInfoPanel
         Name = "InfoPanel"
         MoveScaled(16,1,49,43)
@@ -193,6 +158,41 @@
           Transparent = True
         }
       }
+      { pictureshadeup PictureBox Pictureshade
+        Name = "pictureshadeup"
+        MoveScaled(22,1,54,9)
+        Ignore = True
+        Picture = Picture["shadeupEPG.png"]
+        Stretch = True
+      }
+      { pictureshaderight PictureBox Pictureshade
+        Name = "pictureshaderight"
+        MoveScaled(69,-4,7,48)
+        Ignore = True
+        Picture = Picture["shaderight.png"]
+        Stretch = True
+      }
+      { pictureshadeleft PictureBox Pictureshade
+        Name = "pictureshadeleft"
+        MoveScaled(22,-4,7,48)
+        Ignore = True
+        Picture = Picture["shadeleft.png"]
+        Stretch = True
+      }
+      { pictureshadelow PictureBox Pictureshade
+        Name = "pictureshadelow"
+        MoveScaled(22,35,54,9)
+        Ignore = True
+        Picture = Picture["shadelowEPG.png"]
+        Stretch = True
+      }
+      { InfoPanelShadow PictureBox
+        MoveScaled(24,7,38,35)
+        Visible = False
+        Ignore = True
+        Picture = Picture["shadowframe.png"]
+        Stretch = True
+      }
     }
     { HBox4 HBox
       MoveScaled(33,66,79,0.7143)

xt7-player-mpv-0.22.391.tar.gz/.src/Form/FMain.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/FMain.class Changed

@@ -453,7 +453,7 @@
 global.initearlyformsdone = True
 SubAndOsd.Init()
 GeneralOptions.Init()
- generaloptions.BackColorChooseBTN2.background = Color.Merge(Color.TextBackground, Color.black, 0.1)
+ generaloptions.BackColorChooseBTN2.background = Color.Merge(Color.TextBackground, Color.black, 0.05)
 Try Last.mouse = mouse.default
 fmain.mouse = mouse.default
 global.myDebug("Ends at:" & Time)
@@ -633,6 +633,7 @@
 Endif
 Endif
 Endif
+
 If entry Like ("*" & sep & "*") Then
 Try RecentFileEntry.caption = Split(entry, sep, "", True, "")[0]
 If Error Then Return
@@ -640,6 +641,7 @@
 If Error Then Return
 Else
 RecentFileEntry.caption = entry
+ RecentFileEntry.tag = entry
 Endif
 RecentFileEntry.Picture = picture["icon:/medium/recent"]
 Next 'entry
@@ -1247,6 +1249,7 @@
 Endif
 Try UrlBox.text = path
 Try FileView1.dir = path
+ Wait
 gridpanels_arrange()
 FileView1.ShowDetailed = True
 
@@ -1682,11 +1685,7 @@
 
 Dim PrevScreenX As Integer = fmain.screenx
 Dim PrevScreeny As Integer = fmain.screeny
- 
- If (GeneralOptions.SaveGeometryCHK.value = True) Then
- SubSaveFormGeometry(fmain.x - fmain.screenx, fmain.y - fmain.screeny)
- Endif
-
+ SubSaveFormGeometry(fmain.x - fmain.screenx, fmain.y - fmain.screeny)
 End
 
 Public Sub SubSaveFormGeometry(offsetx As Integer, offsety As Integer)
@@ -1989,11 +1988,13 @@
 'primary
 SubMenu = New Menu(PrimaryMenu) As "MenuswitchsubPrimary"
 SubMenu.name = "SubMenuID" & i
- SubMenu.caption = mplayer.getP("subtitletracks")[i]
+ SubMenu.tag = mplayer.getP("subtitletracks")[i]
+ SubMenu.caption = submenu.tag
 'secondary
 SubMenu = New Menu(SecondaryMenu) As "MenuswitchsubSecondary"
 SubMenu.name = "SubMenuID" & i
- SubMenu.caption = mplayer.getP("subtitletracks")[i]
+ submenu.tag = mplayer.getP("subtitletracks")[i]
+ SubMenu.caption = submenu.tag
 Next 'i
 Endif
 
@@ -2433,9 +2434,9 @@
 brother.checked = False
 Next
 Last.checked = True
- sid = Split(Last.caption, " ", "", True)[0]
+ sid = Split(Last.tag, " ", "", True)[0]
 mplayer.set_property_mpv("secondary-sid", sid)
- mplayer.ShowText(("Secondary subtitle") & ": " & Last.caption)
+ mplayer.ShowText(("Secondary subtitle") & ": " & Last.tag)
 End
 
 
@@ -2446,9 +2447,9 @@
 brother.checked = False
 Next
 Last.checked = True
- sid = Split(Last.caption, " ", "", True)[0]
+ sid = Split(Last.tag, " ", "", True)[0]
 mplayer.set_property_mpv("sid", sid)
- mplayer.ShowText(("Primary subtitle") & ": " & Last.caption)
+ mplayer.ShowText(("Primary subtitle") & ": " & Last.tag)
 End
 
 
@@ -2461,7 +2462,9 @@
 global.myDebug("Error setting up dbus")
 Return
 Endif
- Try DBus.Session.Register(mpris, "/org/mpris/MediaPlayer2", ["org.mpris.MediaPlayer2", "org.mpris.MediaPlayer2.Player", "org.mpris.MediaPlayer2.TrackList", "org.mpris.MediaPlayer2.Playlists", "org.freedesktop.Dbus.Properties", "org.freedesktop.Dbus.Introspectable"])
+ 'Try DBus.Session.Register(mpris, "/org/mpris/MediaPlayer2", ["org.mpris.MediaPlayer2", "org.mpris.MediaPlayer2.Player", "org.mpris.MediaPlayer2.TrackList", "org.mpris.MediaPlayer2.Playlists" ,"org.freedesktop.Dbus.Properties", "org.freedesktop.Dbus.Introspectable"])
+ 'Try DBus.Session.Register(mpris, "/org/mpris/MediaPlayer2", ["org.mpris.MediaPlayer2", "org.mpris.MediaPlayer2.Player", "org.freedesktop.Dbus.Properties", "org.freedesktop.Dbus.Introspectable"])
+ Try DBus.Session.Register(mpris, "/org/mpris/MediaPlayer2", ["org.mpris.MediaPlayer2", "org.mpris.MediaPlayer2.Player"])
 If Error Then 
 global.myDebug("Error setting up dbus")
 Return
@@ -3940,6 +3943,10 @@
 End Select
 
 Returnlabel:
+ If DbusAlreadyRegistered Then 'cercami
+ mpris.emit_propertychanged() 'cercami
+ Endif
+ 
 Return
 
 End
@@ -6909,7 +6916,6 @@
 
 If tabselectedbrowse() Then
 Wait 
- 'FileView1_beforeArrange()
 gridpanels_arrange()
 Endif
 
@@ -9274,6 +9280,7 @@
 Private Sub HideScrollbars(librarygrid As Gridview)
 
 librarygrid.Scrollbar = Scroll.none
+ Wait
 GridPanels_Arrange() 'pre
 
 End
@@ -9334,7 +9341,7 @@
 End
 
 Public Sub MenuEmbeddedCoversPls_click()
- UpdateCoverFromSelected(playlistgrid, playlistclass)
+ UpdateCoverFromSelected(playlistgrid, myplaylist)
 End
 
 Public Sub MenuPlsSetCover_click()
@@ -9353,7 +9360,6 @@
 Dim r As Integer
 Dim coverfilename As String
 Dim fullpath, album, artist As String
- 
 If MyQuestion.Ask(("xt7 will try to update the cover,\nBeware that covers set by you will be lost."), "Ok", "Cancel") = 2 Then Return
 mygrid.mouse = mouse.wait
 mygrid.enabled = False
@@ -9446,6 +9452,7 @@
 If String.Right(FileView1.dir, 1) = "/" Then FileView1.dir = String.Left(FileView1.dir, Len(FileView1.dir) - 1)
 FileView1.dir = File.dir(FileView1.dir)
 urlbox.text = Replace(FileView1.dir, "//", "/")
+ Wait
 gridpanels_arrange()
 Object.unLock(urlbox)
 End
@@ -9467,6 +9474,7 @@
 Try selecteditem = FileView1.Selection[0]
 If IsDir(fullpathitem) Then
 FileView1.dir = fullpathitem
+ Wait
 gridpanels_arrange()
 urlbox.text = Replace(FileView1.dir, "//", "/")
 If String.Right(urlbox.text, 1) = "/" Then urlbox.text = String.Left(urlbox.text, Len(urlbox.text) - 1)
@@ -9489,6 +9497,7 @@
 If (key.code = key.enter) Or (key.code = key.Return) Then
 If Urlbox.text <> FileView1.dir Then
 FileView1.dir = Urlbox.text
+ Wait
 gridpanels_arrange()
 Endif
 Endif
@@ -9581,6 +9590,7 @@
 
 If Trim(Urlbox.text) = "" Then Urlbox.text = "/"
 FileView1.dir = Urlbox.text
+ Wait
 gridpanels_arrange()
 End
 
@@ -10146,7 +10156,12 @@
 
 prevlayout = hsplit1.Layout
 Wait 0.025
- If prevlayout[0] <> hsplit1.layout[0] Then Return
+ If hsplit1.Layout.count > 0 Then
+ If prevlayout.count > 0 Then
+ If prevlayout[0] <> hsplit1.layout[0] Then Return 
+ Endif
+ Endif
+ 
 
 timerhideshowvideo.start
 
@@ -10209,13 +10224,7 @@
 shadeup.x = brother.x + dltx 
 Try shadeup.y = brother.clienty + brother.Columns.Height + dlty
 If Error Then Try shadeup.y = brother.clienty + dlty
- ' If (brother.Scrollbar = Scroll.Both Or brother.Scrollbar = Scroll.Horizontal) Then
- ' shadelow.y = brother.clienty + brother.clienth - shadelow.h + 2 + dlty
- ' Else
- ' shadelow.y = brother.clienty + brother.h - shadelow.h + 2 + dlty
- ' Endif
 Try shadeup.w = brother.clientw + 2
- ' shadelow.w = brother.clientw + 2
 End

xt7-player-mpv-0.22.391.tar.gz/.src/Form/FMain.form -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/FMain.form Changed

@@ -826,7 +826,7 @@
         Orientation = Align.Left
         Index = 0
         Text = ("Library")
-        Picture = Picture["icon:/16/book"]
+        Picture = Picture["icon:/small/book"]
         { NOPARSETABLIBRARY Label
           MoveScaled(1,1,8,3)
           Visible = False
@@ -994,7 +994,7 @@
         }
         Index = 3
         Text = ("Browse")
-        Picture = Picture["icon:/16/directory"]
+        Picture = Picture["icon:/small/directory"]
         { NOPARSETABBROWSE Label
           MoveScaled(1,1,8,3)
           Visible = False
@@ -1009,14 +1009,19 @@
           Margin = True
           Padding = 1
           { Button_mounts Button
-            MoveScaled(1,0,4,4.5714)
+            MoveScaled(0,0,4,4.5714)
+            ToolTip = ("Mounted devices")
+            Picture = Picture["icon:/small/computer"]
+          }
+          { Button_bookmarks Button
+            MoveScaled(5,0,4,4.5714)
             ToolTip = ("Mounted devices")
-            Picture = Picture["icon:/16/computer"]
+            Picture = Picture["icon:/small/bookmark"]
           }
           { ButtonUp Button
             MoveScaled(10,0,4,4.5714)
             ToolTip = ("Parent")
-            Picture = Picture["icon:/16/up"]
+            Picture = Picture["icon:/small/up"]
           }
           { UrlBox ComboBox
             MoveScaled(15,0,7,4.5714)
@@ -1030,12 +1035,12 @@
           { ButtonRefresh Button
             MoveScaled(24,0,4,4.5714)
             ToolTip = ("Refresh")
-            Picture = Picture["icon:/16/refresh"]
+            Picture = Picture["icon:/small/refresh"]
           }
           { ButtonHidden Button
             MoveScaled(29,0,4,4.5714)
             ToolTip = ("Show/Hide hidden files")
-            Picture = Picture["icon:/16/watch"]
+            Picture = Picture["icon:/small/watch"]
           }
         }
         { Panel16 Panel gridpanels
@@ -1054,7 +1059,7 @@
           }
           { shadeup PictureBox shadeuplow
             Name = "shadeup"
-            MoveScaled(-6,0,31,2)
+            MoveScaled(0,2,31,2)
             Visible = False
             Ignore = True
             Picture = Picture["shadeup.png"]
@@ -1063,7 +1068,7 @@
         }
         Index = 4
         Text = ("Chapters")
-        Picture = Picture["icon:/16/view-detail"]
+        Picture = Picture["icon:/small/view-detail"]
         { NOPARSETABCHAPTERS Label
           MoveScaled(0,0,8,3)
           Visible = False
@@ -1183,7 +1188,7 @@
         }
         Index = 7
         Text = ("DVD")
-        Picture = Picture["icon:/16/cdrom"]
+        Picture = Picture["icon:/small/cdrom"]
         { NOPARSETABDVD Label
           MoveScaled(2,1,8,3)
           Visible = False
@@ -1408,7 +1413,7 @@
               Text = ("Order by")
             }
             { ComboBoxOrderBy ComboBox
-              MoveScaled(9.4286,-46.2857,18,4.5714)
+              MoveScaled(9.4286,-49.2857,18,4.5714)
               #Translate = False
               Expand = True
               ReadOnly = True
@@ -1636,7 +1641,7 @@
         }
         Index = 13
         Text = ("Profiles")
-        Picture = Picture["icon:/16/properties"]
+        Picture = Picture["icon:/small/properties"]
         { NOPARSETABPROFILES Label
           MoveScaled(2,1,8,3)
           Visible = False
@@ -1720,7 +1725,7 @@
             MoveScaled(0,0,4,4.5714)
             ToolTip = ("Show and select the possible search fields")
             AutoResize = True
-            Picture = Picture["icon:/16/find"]
+            Picture = Picture["icon:/small/find"]
           }
           { SearchField ComboBox
             MoveScaled(5,0,5,4.5714)
@@ -1747,7 +1752,7 @@
             MoveScaled(24,0,5,4.5714)
             Background = Color.Background
             ToolTip = ("Show media info when hovering a list item.")
-            Picture = Picture["icon:/16/info"]
+            Picture = Picture["icon:/small/info"]
             Value = True
           }
         }
@@ -1755,7 +1760,7 @@
           MoveScaled(31,0,5,4.5714)
           Background = Color.Background
           ToolTip = ("Play next media as the previous reaches the end.")
-          Picture = Picture["icon:/16/end"]
+          Picture = Picture["icon:/small/end"]
         }
       }
     }

xt7-player-mpv-0.22.391.tar.gz/.src/Form/GeneralOptions.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/GeneralOptions.class Changed

@@ -353,7 +353,9 @@
 myopts.Add(newopt("demuxer-lavf-probesize", comboboxtsprobe.text))
 Endif
 
- 
+ 'audio-device
+ myopts.Add(newopt("audio-device", Split(nopParseaudiodevicecombo.text, "~")[0]))
+ 
 'audio passthrough
 For Each option In noparsevboxpt.Children
 If option Is Togglebutton Then
@@ -404,12 +406,7 @@
 myopts.Add(newopt("osd-level", "0"))
 myopts.Add(newopt("osd-color", "#00000000"))
 myopts.Add(newopt("osd-scale", "0.01"))
-
- If global.mpv_version = "" Then global.mpv_version = fmain.mplayer.version()
- If global.mpv_version = "0.21.0" Then
- myopts.Add(newopt("hr-seek", "yes"))
- Endif
- 
+ myopts.Add(newopt("hr-seek", "yes"))
 Endif
 Return myopts
 End
@@ -1144,24 +1141,6 @@
 
 
 
-
-
-Public Sub NopParseAudioDeviceCombo_Enter()
- Dim d, ad, t As String
- t = Last.text
- If NopParseAudioDeviceCombo.count < 2 Then
- Shell fmain.mplayer.executable(5) & " --audio-device=help " To ad
- For Each d In Split(ad, "\n", "", True)
- Try NopParseAudioDeviceCombo.Add(Split(d, "'", "", True)[1])
- Try global.myDebug(Split(d, "'", "", True)[1])
- Next
- Endif
- Last.text = t
-
-End
-
-
-
 Public Sub ScrollViewUserOptions_Arrange()
 Dim o As Object
 Dim c As Combobox
@@ -1551,6 +1530,81 @@
 End
 
 
+' Public Sub GetAlsaDevices() As String[]
+' Dim acard, acardid, acardname, apcm, apcminfo, apcminfos, apcmid As String
+' Dim adevices As New String[]
+' Dim apcms As New String[]
+' Dim acards As New String[]
+' Dim sep As String = Chr(126)
+' adevices.Add("plug:dmix" & " " & sep & " " & "(" & ("Default device, software mixing") & ")")
+' adevices.Add("default" & " " & sep & " " & "(" & ("Default alsa device") & ")")
+' adevices.Add("spdif" & " " & sep & " " & "(" & ("Default S/PDIF device") & ")")
+' adevices.Add("hdmi" & " " & sep & " " & "(" & ("Default hdmi device") & ")")
+' Try acards = Dir("/proc/asound/", "card*", gb.directory)
+' If Not Error Then
+' For Each acard In acards
+' Try acardname = Trim(File.Load("/proc/asound/" & acard & "/id"))
+' If Error Then acardname = "Unknown Card"
+' acardid = Replace(acard, "card", "")
+' Try apcms = Dir("/proc/asound/" & acard, "pcm*p").Sort(gb.Ascent)
+' If Not Error Then
+' For Each apcm In apcms
+' Try apcminfos = Trim(File.Load("/proc/asound/" & acard & "/" & apcm & "/info"))
+' If Error Then apcminfos = "name: No pcm info"
+' For Each apcminfo In Split(apcminfos, "\n", "", True)
+' If apcminfo Like "name: *" Then
+' apcminfo = Trim(Split(apcminfo, ":", "", True)[1])
+' apcmid = Replace(apcm, "pcm", "")
+' apcmid = Trim(Replace(apcmid, "p", ""))
+' Break
+' Endif
+' Next
+' ' global.myDebug( acardid, apcmid, acardname, apcminfo)
+' adevices.add("[plughw:" & acardid & "," & apcmid & "]" & " " & sep & " " & "(" & acardname & ":" & apcminfo & ")")
+' Next
+' Endif
+' 
+' Next
+' Endif
+' 
+' Return adevices
+' 
+' End
+
+
+'Public Sub NopParseAudioDeviceCombo_Enter()
+ ' Dim d, ad, t, adevice As String
+ ' Dim out As New String[]
+ ' t = Last.text
+ ' If NopParseAudioDeviceCombo.count < 2 Then
+ ' Shell fmain.mplayer.executable(5) & " --audio-device=help " To ad
+ ' For Each d In Split(ad, "\n", "", True)
+ ' Try out.Add(Split(d, "'", "", True)[1])
+ ' Try global.myDebug(Split(d, "'", "", True)[1])
+ ' Next
+ ' For Each adevice In GetAlsaDevices()
+ ' out.Add("alsa/" & adevice)
+ ' Next
+ ' NopParseAudioDeviceCombo.List = out.Sort()
+ ' 
+ ' Last.text = t
+ ' Endif
+'End
+
+Public Sub NopParseAudioDeviceCombo_Enter()
+ Dim t As String
+ t = Last.text
+ Object.Lock(Last)
+ Last.enabled = False
+ If NopParseAudioDeviceCombo.count < 2 Then
+ NopParseAudioDeviceCombo.List = fmain.mplayer.audio_devices_list(" ~ ")
+ Endif
+ Last.text = t
+ Object.unLock(Last)
+ Last.enabled = True
+End
+
+
 ' '---------------- HACKY WORKAROUND TO STOP SCROLLVIEWS SCROLLING WHEN OBJECTS ARE FOCUSED
 ' Private Scrollview_is_focused As New Collection
 ' Private scrollview_scrolly As New Collection

xt7-player-mpv-0.22.391.tar.gz/.src/Form/GeneralOptions.form -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/GeneralOptions.form Changed

@@ -677,7 +677,7 @@
           Indent = True
           { CacheCheckbox CheckBox notifyobj
             Name = "CacheCheckbox"
-            MoveScaled(1,0,26,4.5714)
+            MoveScaled(2,0,26,4.5714)
             AutoResize = True
             Text = ("Local file cache size (KB)")
             Value = CheckBox.True
@@ -685,10 +685,17 @@
           { CacheSpinBox SpinBox notifyobj
             Name = "CacheSpinBox"
             MoveScaled(29,0,11,4.5714)
+            Expand = True
             MinValue = 100
             MaxValue = 1048576
             Value = 10240
           }
+          { Label11 Label labelcheck
+            Name = "Label11"
+            MoveScaled(40,0,6,4.5714)
+            AutoResize = True
+            Text = ("KBytes")
+          }
         }
         { NoParse44 HBox
           MoveScaled(2,16,50,4.5714)
@@ -705,6 +712,7 @@
           { CacheMinSpinboxFile SpinBox notifyobj
             Name = "CacheMinSpinboxFile"
             MoveScaled(29,0,11,4.5714)
+            Expand = True
             MaxValue = 100000
           }
           { Label19 Label labelcheck
@@ -741,10 +749,17 @@
           { CDDACacheSpinBox SpinBox notifyobj
             Name = "CDDACacheSpinBox"
             MoveScaled(26,0,11,4.5714)
+            Expand = True
             MinValue = 100
             MaxValue = 1048576
             Value = 10240
           }
+          { Label15 Label labelcheck
+            Name = "Label15"
+            MoveScaled(39,0,6,4.5714)
+            AutoResize = True
+            Text = ("KBytes")
+          }
         }
         { NoParse24 HBox
           MoveScaled(2,27,48,4.5714)
@@ -760,10 +775,17 @@
           { DVDCacheSpinBox SpinBox notifyobj
             Name = "DVDCacheSpinBox"
             MoveScaled(24,1,11,4.5714)
+            Expand = True
             MinValue = 100
             MaxValue = 1048576
             Value = 1024
           }
+          { Label17 Label labelcheck
+            Name = "Label17"
+            MoveScaled(38,0,6,4.5714)
+            AutoResize = True
+            Text = ("KBytes")
+          }
         }
         { NoParseTitleLabel3 Panel
           MoveScaled(2,31,54,3)
@@ -793,10 +815,17 @@
           { NetCacheSpinBox SpinBox notifyobj
             Name = "NetCacheSpinBox"
             MoveScaled(28,0,11,4.5714)
+            Expand = True
             MinValue = 100
             MaxValue = 1048576
             Value = 1024
           }
+          { Label18 Label labelcheck
+            Name = "Label18"
+            MoveScaled(41,0,6,4.5714)
+            AutoResize = True
+            Text = ("KBytes")
+          }
         }
         { NoParse32 HBox
           MoveScaled(2,38,50,4.5714)
@@ -813,13 +842,14 @@
           { cacheminspinbox SpinBox notifyobj
             Name = "cacheminspinbox"
             MoveScaled(25,0,11,4.5714)
+            Expand = True
             MaxValue = 100000
           }
           { Label9 Label labelcheck
             Name = "Label9"
             MoveScaled(40,0,8,4.5714)
             AutoResize = True
-            Text = ("Kbytes")
+            Text = ("KBytes")
           }
         }
         { NoParse34 HBox
@@ -837,13 +867,14 @@
           { cacheseekspinbox SpinBox notifyobj
             Name = "cacheseekspinbox"
             MoveScaled(25,1,11,4.5714)
+            Expand = True
             MaxValue = 100000
           }
           { Label12 Label labelcheck
             Name = "Label12"
             MoveScaled(40,1,9,4.5714)
             AutoResize = True
-            Text = ("Kbytes")
+            Text = ("KBytes")
           }
         }
         { NoParseTitleLabel4 Panel
@@ -873,11 +904,18 @@
           }
           { dvbtCacheSpinBox SpinBox notifyobj
             Name = "dvbtCacheSpinBox"
-            MoveScaled(34,0,11,4.5714)
+            MoveScaled(30,0,11,4.5714)
+            Expand = True
             MinValue = 100
             MaxValue = 1048576
             Value = 10240
           }
+          { Label20 Label labelcheck
+            Name = "Label20"
+            MoveScaled(43,0,6,4.5714)
+            AutoResize = True
+            Text = ("KBytes")
+          }
         }
         { NoParse39 HBox
           MoveScaled(2,54,50,4.5714)
@@ -894,13 +932,14 @@
           { dvbtcacheminspinbox SpinBox notifyobj
             Name = "dvbtcacheminspinbox"
             MoveScaled(24,1,8,4.5714)
+            Expand = True
             MaxValue = 99
           }
           { Label16 Label labelcheck
             Name = "Label16"
             MoveScaled(33,0,14,4.5714)
             AutoResize = True
-            Text = ("Kbytes")
+            Text = ("KBytes")
           }
         }
       }
@@ -1633,25 +1672,6 @@
             Value = CheckBox.True
           }
         }
-        { NoParse21 HBox
-          MoveScaled(1,55,50,4.5714)
-          ToolTip = ("Save xt7 position and size on program exit.")
-          Spacing = True
-          { SaveGeometryCHK CheckBox
-            MoveScaled(0,0,49,4.5714)
-            Text = ("Also save xt7 geometry on exit")
-            Value = CheckBox.True
-          }
-        }
-        { NoParse22 HBox
-          MoveScaled(1,59,50,4.5714)
-          ToolTip = ("If your window manager is not kwin\nand you find that form position is not correctly restored,\ntry checking this.")
-          Spacing = True
-          { SaveGeometryCompizCHK CheckBox
-            MoveScaled(-1,0,48,4.5714)
-            Text = ("Alternative saving method (compiz/emerald)")
-          }
-        }
       }
       Index = 11
       Text = ("User Options")

xt7-player-mpv-0.22.391.tar.gz/.src/Form/HotKeyGrab.form -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/HotKeyGrab.form Changed

xt7-player-mpv-0.22.391.tar.gz/.src/Form/HotKeys.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/HotKeys.class Changed

xt7-player-mpv-0.22.391.tar.gz/.src/Form/HotKeys.form -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/HotKeys.form Changed

xt7-player-mpv-0.22.391.tar.gz/.src/Form/NewChains.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/NewChains.class Changed

@@ -50,7 +50,7 @@
 Private Sub Init_filters_audio()
 Dim filters_audio_list As New String[]
 Dim filter As String
- filters_audio_list = ["equalizer", "anequalizer", "earwax", "extrastereo", "scaletempo", "alimiter", "dynaudnorm", "volume"]
+ filters_audio_list = ["equalizer", "anequalizer", "compand", "earwax", "extrastereo", "scaletempo", "alimiter", "dynaudnorm", "volume"]
 filters_audio_list.insert(["CustomAudio1", "CustomAudio2", "CustomAudio3", "lavcac3enc", "lavrresample"])
 For Each filter In filters_audio_list
 If filter = "scaletempo" Then 
@@ -330,16 +330,27 @@
 Next
 object.Attach(atabstrip, atabstrip.parent, atabstrip.name)
 
+
+
+
 Try item_tab = aTabstrip.Tag.Find(Lower(item_name))
 
 If item_tab >= 0 Then 
 aTabstrip.index = item_tab
- If atabstrip.caption <> "anequalizer" Then HelpBox.reparent(aTabstrip)
+ If atabstrip.caption <> "anequalizer" Then 
+ If atabstrip.caption <> "compand" Then 
+ HelpBox.reparent(aTabstrip)
+ Endif
+ Endif
 Else
 For i = 0 To aTabstrip.count - 1
 aTabstrip.index = i
 If Lower(aTabstrip.caption) = item_name Then 
- If atabstrip.caption <> "anequalizer" Then HelpBox.reparent(aTabstrip)
+ If atabstrip.caption <> "anequalizer" Then 
+ If atabstrip.caption <> "compband" Then 
+ HelpBox.reparent(aTabstrip)
+ Endif
+ Endif
 Goto returnlabel
 Endif
 Next
@@ -363,8 +374,6 @@
 Init_filters_audio()
 Init_filters_video()
 tabstrip1.index = 0
- 
- 
 f1.value = 50
 g1.value = 0
 w1.value = 100
@@ -380,7 +389,9 @@
 f5.value = 4000
 g5.value = 0
 w5.value = 1000
- 
+ f6.value = 8000
+ g6.value = 0
+ w6.value = 1000
 initdone = True
 End
 
@@ -421,6 +432,7 @@
 AllParams.add(["ROCHOOSE", "replaygain-album=", "yes", "no", "Volume3", ("Like replaygain-track, but using the album-gain value")])
 AllParams.add(["ROCHOOSE", "replaygain-clip=", "yes", "no", "Volume5", ("Prevent replaygain clipping by lowering the gain")])
 AllParams.add(["ROCHOOSE", "softclip=", "yes", "no", "Volume6", ("Turns on soft clipping")])
+ AllParams.Add(["TIP", ("Put this filter at the end of the chain, but before lavrresample (if enabled)"), "Volume7", ""])
 Global.DrawGui(AllParams, "volume", aTabstrip, switchable,,,, Me)
 AllParams.Clear
 
@@ -449,6 +461,7 @@
 Global.DrawGui(AllParams, "extrastereo", aTabstrip, NotSwitchable,,, "lavfi", Me)
 AllParams.Clear
 
+
 ' 'alimiter lavfi
 AllParams.Add(["TITLE", "Keep input signal under a desired threshold - (ffmpeg >=3.0 only)", "alimiter0", ""])
 AllParams.add(["RANGEFLOAT", "Input gain", "0.1", "5", "64", "alimiter1", ""])
@@ -462,7 +475,6 @@
 AllParams.add(["RANGEFLOAT", "asc_level", "0", "1", "1", "alimiter7", ""]) 
 
 AllParams.Add(["TIP", ("This filter is a good volume normalizer"), "alimiter6", ""])
- AllParams.Add(["TIP", ("It is best to place the volume filter after alimiter"), "alimiter7", ""])
 Global.DrawGui(AllParams, "alimiter", aTabstrip, False,,, "lavfi", Me)
 AllParams.Clear
 
@@ -470,7 +482,7 @@
 AllParams.Add(["TITLE", "Audio resampler: set the default audio resampler quality", "lavrresample0", ""])
 AllParams.add(["RANGE", "phase-shift=", "4", "10", "20", "lavrresample1", "Higher=slower and better quality"]) 
 AllParams.add(["ROCHOOSE", "linear=", "yes", "no", "lavrresample2", "filter linear interpolation"])
- AllParams.Add(["TIP", ("Put this filter at the end of the chain, but before lavcac3enc"), "lavrresample3", ""])
+ AllParams.Add(["TIP", ("Put this filter at the end of the chain, but before lavcac3enc (if enabled)"), "lavrresample3", ""])
 Global.DrawGui(AllParams, "lavrresample", aTabstrip, switchable,,, "", Me)
 
 AllParams.Clear
@@ -488,7 +500,6 @@
 AllParams.add(["ROCHOOSE", "Enable DC bias correction", "0 - disable", "1 - enable", "dynaudnorm7", ""])
 AllParams.add(["ROCHOOSE", "Enable alternative boundary mode", "1 - enable", "0 - disable", "dynaudnorm8", ""])
 AllParams.add(["RANGEFLOAT", "Compress factor", "0", "0", "30", "dynaudnorm9", ""]) 
- AllParams.Add(["TIP", ("It is best to place the volume filter after dynaudnorm"), "dynaudnorm110", ""])
 Global.DrawGui(AllParams, "dynaudnorm", aTabstrip, False,,, "lavfi", Me)
 AllParams.Clear
 'or 50 11 1 5 0 0 0 0 0
@@ -948,8 +959,9 @@
 Dim is_lavfi As Boolean = False
 Dim subtext As String
 Dim anequalizer_string As String
+ Dim out_anequalizer As String = ""
 Dim atabstrip_index As Integer
-
+ Dim autogaindB As Integer
 
 'Find the ParsedFilter Tab and activate it:
 atabstrip_index = aTabstrip.Tag.Find(ParsedFilter)
@@ -957,8 +969,15 @@
 out = ParseEq() 
 Return out
 Else If Parsedfilter = "anequalizer" Then
- anequalizer_string = eqstring(False)
- Return "\"lavfi=[anequalizer=" & eqstring(False) & "]\"" 'this way it works at start time only" 
+ anequalizer_string = eqstring(False, ByRef autogaindB)
+ If autogaindB > 0 Then
+ out_anequalizer = "lavfi=[volume=-" & autogaindB & "dB],"
+ Endif 
+ out_anequalizer &= "\"lavfi=[anequalizer=" & anequalizer_string & "]\"" 'this way it works at start time only" 
+ Return out_anequalizer
+ Else If Parsedfilter = "compand" Then
+ Return parse_compand()
+ 
 
 Else If Parsedfilter Like "customaudio*" Then
 out = parse_audio_filter_custom(atabstrip_index)
@@ -1003,6 +1022,9 @@
 Endif
 Next
 Next
+ 
+ 
+ 
 
 If (Right(tmpstring) = ":") Then
 TmpString = Left(Tmpstring, - 1)
@@ -1016,6 +1038,8 @@
 End
 
 Public Sub ApplyBTN_Click()
+ If Not initdone Then Return
+ If Not alreadyloaded Then Return
 OkToChangeToCustom = False
 Fmain.apply
 OkToChangeToCustom = True
@@ -1441,9 +1465,9 @@
 Me.hide
 End
 
+
 Private aligned As Boolean = False
 Public Sub Form_Open()
-
 If Not initdone Then 
 Try GeneralOptions.FirstLoadIfNeeded()
 Init()
@@ -1666,46 +1690,7 @@
 TextBox8pcm.text = "\"" & myDialog.Path & "\""
 End
 
-Public Sub GetAlsaDevices() As String[]
- Dim acard, acardid, acardname, apcm, apcminfo, apcminfos, apcmid As String
- Dim adevices As New String[]
- Dim apcms As New String[]
- Dim acards As New String[]
- Dim sep As String = Chr(126)
- adevices.Add("plug:dmix" & " " & sep & " " & "(" & ("Default device, software mixing") & ")")
- adevices.Add("default" & " " & sep & " " & "(" & ("Default alsa device") & ")")
- adevices.Add("spdif" & " " & sep & " " & "(" & ("Default S/PDIF device") & ")")
- adevices.Add("hdmi" & " " & sep & " " & "(" & ("Default hdmi device") & ")")
- Try acards = Dir("/proc/asound/", "card*", gb.directory)
- If Not Error Then
- For Each acard In acards
- Try acardname = Trim(File.Load("/proc/asound/" & acard & "/id"))
- If Error Then acardname = "Unknown Card"
- acardid = Replace(acard, "card", "")
- Try apcms = Dir("/proc/asound/" & acard, "pcm*p").Sort(gb.Ascent)
- If Not Error Then
- For Each apcm In apcms
- Try apcminfos = Trim(File.Load("/proc/asound/" & acard & "/" & apcm & "/info"))
- If Error Then apcminfos = "name: No pcm info"
- For Each apcminfo In Split(apcminfos, "\n", "", True)
- If apcminfo Like "name: *" Then
- apcminfo = Trim(Split(apcminfo, ":", "", True)[1])
- apcmid = Replace(apcm, "pcm", "")
- apcmid = Trim(Replace(apcmid, "p", ""))
- Break
- Endif
- Next
- ' global.myDebug( acardid, apcmid, acardname, apcminfo)
- adevices.add("[plughw:" & acardid & "," & apcmid & "]" & " " & sep & " " & "(" & acardname & ":" & apcminfo & ")")
- Next
- Endif
 
- Next
- Endif
-

xt7-player-mpv-0.22.391.tar.gz/.src/Form/NewChains.form -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/NewChains.form Changed

@@ -62,7 +62,7 @@
       Index = 0
       Text = "tabstrip1"
       { HelpBox Panel
-        MoveScaled(3,11,54,29)
+        MoveScaled(1,5,54,33)
         Tag = "0"
         Arrangement = Arrange.Vertical
         { Button_show_man ToggleButton
@@ -103,18 +103,17 @@
       Picture = Picture["icon:/16/tools"]
     }
     { TabStrip_filters_audio TabStrip
-      MoveScaled(31,-1,56,47)
+      MoveScaled(34,0,56,47)
       #Translate = False
-      Tag = "anequalizer"
       Expand = True
       Arrangement = Arrange.Fill
       Margin = True
-      Count = 2
+      Count = 3
       TextFont = Font["-1"]
       Index = 0
       Text = "equalizer"
       { ScrollView1xx Panel
-        MoveScaled(0,1,64,39)
+        MoveScaled(0,0,64,39)
         Expand = True
         Arrangement = Arrange.Horizontal
         Spacing = True
@@ -345,7 +344,7 @@
       Index = 1
       Text = "anequalizer"
       { AnEqualizerPanel Panel
-        MoveScaled(-3,2,88,38)
+        MoveScaled(3,2,88,38)
         Expand = True
         Arrangement = Arrange.Vertical
         { PictureBox1 PictureBox
@@ -632,7 +631,7 @@
             }
           }
           { FrameBand5 Panel
-            MoveScaled(94,-1,21,24)
+            MoveScaled(94,-2,21,24)
             Font = Font["-1"]
             Arrangement = Arrange.Vertical
             AutoResize = True
@@ -698,6 +697,137 @@
               }
             }
           }
+          { FrameBand6 Panel
+            MoveScaled(116,-3,21,24)
+            Font = Font["-1"]
+            Arrangement = Arrange.Vertical
+            AutoResize = True
+            Spacing = True
+            Margin = True
+            Border = Border.Etched
+            { SwitchButton6 SwitchButton switchers
+              Name = "SwitchButton6"
+              MoveScaled(2,2,17,4)
+              Value = True
+            }
+            { Panel17 Panel
+              MoveScaled(2,7,17,4)
+              ToolTip = ("Center Frequency")
+              Arrangement = Arrange.Horizontal
+              { Label31 Label
+                MoveScaled(1,0,2,4)
+                Text = ("F")
+              }
+              { f6 SpinBox EqControls
+                Name = "f6"
+                MoveScaled(4,0,13,4)
+                Font = Font["-2"]
+                Expand = True
+                MinValue = 1
+                MaxValue = 24000
+                Value = 12000
+              }
+            }
+            { Panel18 Panel
+              MoveScaled(2,12,17,4)
+              ToolTip = ("Gain (dB)")
+              Arrangement = Arrange.Horizontal
+              { Label32 Label
+                MoveScaled(1,0,2,4)
+                Text = ("G")
+              }
+              { g6 SpinBox EqControls
+                Name = "g6"
+                MoveScaled(4,0,13,4)
+                Font = Font["-2"]
+                Expand = True
+                MinValue = -30
+                MaxValue = 30
+              }
+            }
+            { Panel19 Panel
+              MoveScaled(2,17,17,4)
+              ToolTip = ("Filter width (Hz)")
+              Arrangement = Arrange.Horizontal
+              { Label33 Label
+                MoveScaled(1,0,2,4)
+                Text = ("W")
+              }
+              { w6 SpinBox EqControls
+                Name = "w6"
+                MoveScaled(4,0,13,4)
+                Font = Font["-2"]
+                Expand = True
+                MinValue = 1
+                MaxValue = 24000
+                Value = 2000
+              }
+            }
+          }
+        }
+      }
+      Index = 2
+      Text = "compand"
+      { vboxcompand Panel
+        MoveScaled(2,3,52,36)
+        Arrangement = Arrange.Vertical
+        Spacing = True
+        Margin = True
+        { Hbox8 HBox
+          MoveScaled(3,2,51,6)
+          Padding = 6
+          { Label34 Label
+            MoveScaled(1,0,17,5)
+            Text = ("Makeup Gain (dB)")
+          }
+          { makeupgainspinbox SpinBox compand_dynaobj
+            Name = "makeupgainspinbox"
+            MoveScaled(34,0,16,5)
+            Font = Font["Monospace"]
+            Expand = True
+            MinValue = 1
+            MaxValue = 1000
+            Step = 5
+            Value = 15
+          }
+        }
+        { Button_compand_autovalues ToggleButton
+          MoveScaled(1,10,51,4)
+          Text = ("Auto values")
+        }
+        { hboxsoftknee HBox
+          MoveScaled(1,15,51,6)
+          Padding = 6
+          { Label35 Label
+            MoveScaled(2,0,17,5)
+            Text = ("Soft knee radius")
+          }
+          { softkneespinbox SpinBox compand_dynaobj
+            Name = "softkneespinbox"
+            MoveScaled(34,0,16,5)
+            Font = Font["Monospace"]
+            Expand = True
+            MaxValue = 900
+            Step = 5
+            Value = 7
+          }
+        }
+        { hboxdecay HBox
+          MoveScaled(1,22,51,6)
+          Padding = 6
+          { Label36 Label
+            MoveScaled(1,0,17,5)
+            Text = ("Decay (decisecs)")
+          }
+          { DecaySpinbox SpinBox compand_dynaobj
+            Name = "DecaySpinbox"
+            MoveScaled(34,0,16,5)
+            Font = Font["Monospace"]
+            Expand = True
+            MaxValue = 999999
+            Step = 10
+            Value = 150
+          }
         }
       }
       Index = 0
@@ -1231,11 +1361,10 @@
             Tag = "alsa-mixer-device"
             Text = ("Mixer Device")
           }
-          { AlsaDeviceTextBox ComboBox
+          { AlsaMixerDevice ComboBox
             MoveScaled(18,1,26,4.5714)
             Font = Font["Monospace"]
             Expand = True
-            Text = ("spdif")
           }
         }
         { AlsaParseMeHbox1 HBox

xt7-player-mpv-0.22.391.tar.gz/.src/Form/SubAndOsd.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/SubAndOsd.class Changed

xt7-player-mpv-0.22.391.tar.gz/.src/Form/SubAndOsd.form -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/SubAndOsd.form Changed

@@ -422,9 +422,10 @@
 { ComboAlignment ComboBox notifytest
 Name = "ComboAlignment"
 MoveScaled(20,1,20,4.5714)
+ #Translate = False
 ReadOnly = True
- List = [("2) Bottom/Center"), ("1) Bottom/Left"), ("3) Bottom/Right")]
- Text = ("2) Bottom/Center")
+ List = ["2) Bottom/Center", "1) Bottom/Left", "3) Bottom/Right"]
+ Text = "2) Bottom/Center"
 }
 }
 { PositionHBox HBox
@@ -445,45 +446,40 @@
 Value = 95
 }
 }
- { Panel5 Panel
- MoveScaled(1,23,51,5)
- Arrangement = Arrange.Horizontal
- AutoResize = True
- { Label2 Label
- MoveScaled(0,0,24,4.5714)
- Expand = True
- Text = ("Guess codepage for:")
- Alignment = Align.Left
- }
- { EncaComboBox ComboBox
- MoveScaled(32,0,18,4.5714)
- Expand = True
- ReadOnly = True
- List = [("xx (use fallback)"), ("aa (Afar)"), ("ab (Abkhazian)"), ("ae (Avestan)"), ("af (Afrikaans)"), ("ak (Akan)"), ("am (Amharic)"), ("an (Aragonese)"), ("ar (Arabic)"), ("as (Assamese)"), ("av (Avaric)"), ("ay (Aymara)"), ("az (Azerbaijani)"), ("ba (Bashkir)"), ("be (Belarusian)"), ("bg (Bulgarian)"), ("bh (Bihari)"), ("bi (Bislama)"), ("bm (Bambara)"), ("bn (Bengali)"), ("bo (Tibetan)"), ("br (Breton)"), ("bs (Bosnian)"), ("ca (Catalan)"), ("ce (Chechen)"), ("co (Corsican)"), ("cr (Cree)"), ("cs (Czech)"), ("cu (Church)"), ("cv (Chuvash)"), ("cy (Welsh)"), ("da (Danish)")].Insert([("de (German)"), ("dv (Divehi)"), ("dz (Dzongkha)"), ("ee (Ewe)"), ("el (Greek)"), ("en (English)"), ("eo (Esperanto)"), ("es (Spanish)"), ("et (Estonian)"), ("eu (Basque)"), ("fa (Persian)"), ("ff (Fulah)"), ("fi (Finnish)"), ("fj (Fijian)"), ("fo (Faroese)"), ("fr (French)"), ("fy (Frisian)"), ("ga (Irish)"), ("gd (Gaelic)"), ("gl (Galician)"), ("gn (Guarani)"), ("gu (Gujarati)"), ("gv (Manx)"), ("ha (Hausa)"), ("he (Hebrew)"), ("hi (Hindi)"), ("ho (Hiri)"), ("hr (Croatian)"), ("ht (Haitian)"), ("hu (Hungarian)"), ("hy (Armenian)"), ("hz (Herero)")]).Insert([("ch (Chamorro)"), ("ia (Interlingua)"), ("id (Indonesian)"), ("ie (Interlingue)"), ("ig (Igbo)"), ("ii (Sichuan)"), ("ik (Inupiaq)"), ("io (Ido)"), ("is (Icelandic)"), ("it (Italian)"), ("iu (Inuktitut)"), ("ja (Japanese)"), ("jv (Javanese)"), ("ka (Georgian)"), ("kg (Kongo)"), ("ki (Kikuyu)"), ("kj (Kuanyama)"), ("kk (Kazakh)"), ("kl (Greenlandic)"), ("km (Khmer)"), ("kn (Kannada)"), ("ko (Korean)"), ("kr (Kanuri)"), ("ks (Kashmiri)"), ("ku (Kurdish)"), ("kv (Komi)"), ("kw (Cornish)"), ("ky (Kirghiz)"), ("la (Latin)"), ("lb (Luxembourgish)"), ("lg (Ganda)"), ("li (Limburgan)")]).Insert([("ln (Lingala)"), ("lo (Lao)"), ("lt (Lithuanian)"), ("lu (Luba-Katanga)"), ("lv (Latvian)"), ("mg (Malagasy)"), ("mh (Marshallese)"), ("mi (Maori)"), ("mk (Macedonian)"), ("ml (Malayalam)"), ("mn (Mongolian)"), ("mo (Moldavian)"), ("mr (Marathi)"), ("ms (Malay)"), ("mt (Maltese)"), ("my (Burmese)"), ("na (Nauru)"), ("nd (Ndebele)"), ("ne (Nepali)"), ("ng (Ndonga)"), ("nl (Dutch)"), ("nn (Norwegian)"), ("no (Norwegian)"), ("nr (Ndebele)"), ("nv (Navajo)"), ("ny (Chichewa)"), ("oc (Occitan)"), ("oj (Ojibwa)"), ("om (Oromo)"), ("or (Oriya)"), ("os (Ossetian)"), ("pa (Panjabi)")]).Insert([("pi (Pali)"), ("pl (Polish)"), ("ps (Pushto)"), ("pt (Portuguese)"), ("qu (Quechua)"), ("rm (Romansh)"), ("rn (Rundi)"), ("ro (Romanian)"), ("ru (Russian)"), ("rw (Kinyarwanda)"), ("sa (Sanskrit)"), ("sc (Sardinian)"), ("sd (Sindhi)"), ("se (Sami)"), ("sg (Sango)"), ("si (Sinhala)"), ("sk (Slovak)"), ("sl (Slovenian)"), ("sm (Samoan)"), ("sn (Shona)"), ("so (Somali)"), ("sq (Albanian)"), ("sr (Serbian)"), ("ss (Swati)"), ("st (Sotho)"), ("su (Sundanese)"), ("sv (Swedish)"), ("sw (Swahili)"), ("ta (Tamil)"), ("te (Telugu)"), ("tg (Tajik)"), ("th (Thai)")]).Insert([("ti (Tigrinya)"), ("tk (Turkmen)"), ("tl (Tagalog)"), ("tn (Tswana)"), ("to (Tonga)"), ("tr (Turkish)"), ("ts (Tsonga)"), ("tt (Tatar)"), ("tw (Twi)"), ("ty (Tahitian)"), ("ug (Uighur)"), ("uk (Ukrainian)"), ("ur (Urdu)"), ("uz (Uzbek)"), ("ve (Venda)"), ("vi (Vietnamese)"), ("wa (Walloon)"), ("wo (Wolof)"), ("xh (Xhosa)"), ("yi (Yiddish)"), ("yo (Yoruba)"), ("za (Zhuang)"), ("zh (Chinese)"), ("zu (Zulu)")])
- Text = ("iso-8859-1")
- }
- }
 { Panel6 Panel
- MoveScaled(1,28,50,5)
+ MoveScaled(1,24,50,5)
 Arrangement = Arrange.Horizontal
 AutoResize = True
 { Label1 Label
- MoveScaled(0,0,24,4.5714)
+ MoveScaled(1,0,24,4.5714)
 Expand = True
- Text = ("If guess fails, use:")
+ Text = ("Codepage")
 Alignment = Align.Left
 }
 { ComboSubCp ComboBox
 MoveScaled(32,0,17,4.5714)
+ #Translate = False
 Expand = True
 ReadOnly = True
- List = [("big5"), ("cp936"), ("cp949"), ("cp1250"), ("cp1251"), ("cp1253"), ("cp1256"), ("cp874"), ("euc-kr"), ("gb2312"), ("iso-8859-1"), ("iso-8859-2"), ("iso-8859-3"), ("iso-8859-4"), ("iso-8859-5"), ("iso-8859-6"), ("iso-8859-7"), ("iso-8859-8"), ("iso-8859-9"), ("iso-8859-10"), ("iso-8859-11"), ("iso-8859-12"), ("iso-8859-13"), ("iso-8859-14"), ("iso-8859-15"), ("koi8-r"), ("koi8-r"), ("koi8-u/ru"), ("latin2"), ("shift-jis"), ("utf-8"), ("unicode")].Insert([("windows-1250"), ("windows-1251")])
- Text = ("iso-8859-1")
+ List = ["auto", "big5", "cp936", "cp949", "cp1250", "cp1251", "cp1253", "cp1256", "cp874", "euc-kr", "gb2312", "iso-8859-1", "iso-8859-2", "iso-8859-3", "iso-8859-4", "iso-8859-5", "iso-8859-6", "iso-8859-7", "iso-8859-8", "iso-8859-9", "iso-8859-10", "iso-8859-11", "iso-8859-12", "iso-8859-13", "iso-8859-14", "iso-8859-15", "koi8-r", "koi8-r", "koi8-u/ru", "latin2", "shift-jis", "utf-8"].Insert(["unicode", "windows-1250", "windows-1251"])
+ Text = "auto"
 Sorted = True
 }
 }
+ { SubDelayHbox3 HBox
+ MoveScaled(1,29,53,5)
+ ToolTip = ("Subtitle delay.\nmpv option: --sub-delay <sec>")
+ AutoResize = True
+ Spacing = True
+ Padding = 10
+ { codepage_force_combobox CheckBox
+ MoveScaled(1,0,49,5)
+ ToolTip = ("Setting a negative delay for subtitles embedded in mkv files, leads mpv\nto shift only the subtitle end time, because it reads the file sequentially.\nChecking this box will workaround the problem by adding:\n-subfile yourfile.mkv to mpv options, forcing mpv to read\nand shift the subtitles correctly.\nAlso, any ass rendering will be disabled.\nhttp://bugzilla.mplayerhq.hu/show_bug.cgi?id=1870")
+ Text = ("Use that codepage even if input is NOT UTF-8")
+ }
+ }
 { SubDelayHbox HBox
- MoveScaled(1,33,28,4.5714)
+ MoveScaled(1,34,28,4.5714)
 ToolTip = ("Subtitle delay.\nmpv option: --sub-delay <sec>")
 AutoResize = True
 Spacing = True

xt7-player-mpv-0.22.391.tar.gz/.src/Form/zzzFake.class -> xt7-player-mpv-0.24.392.tar.gz/.src/Form/zzzFake.class Changed

xt7-player-mpv-0.22.391.tar.gz/AA_ToDo -> xt7-player-mpv-0.24.392.tar.gz/AA_ToDo Changed

@@ -1,6 +1,4 @@
 pausa se aumentano i drop nel vo
-xrandr, usa display-fps invece che chiamare xrandr
-pausa, cambio speed, unpausa
 
 opzioni aggiuntive opengl?
 custom audio/custom video?
@@ -43,16 +41,9 @@
 - invertire l'ordine dei risultati youtube?
 - opzione "-volume" per il volume iniziale (possibile prenderla direttamente dalla barra del volume?)
 
--crash alla seconda ripetizione dei sub con queste opzioni:
-__GL_SYNC_TO_VBLANK=1  /usr/local/bin/pagecache-management.sh -k 1024 mplayer -identify -slave  -wid 60820713 -noconfig all  -mouse-movements -mf fps=1:type=bmp -loop 0  -ass  -ass-force-style FontName="Segoe UI",FontSize=22,Bold=1,Italic=Alignment=2,outline=1,OutlineColour=H00000000,MarginV=0,PrimaryColour=H0000FFFF,shadow=2,BackColour=H80000000 -subcp enca:it:iso-8859-1 -sub-fuzziness 0  -font "Bitstream Vera Sans" -sub-bg-alpha 210 -subfont-blur 3 -osd-duration 1000 -subfont-osd-scale 2 -subfont-text-scale 2 -subpos 0 -osdlevel 3 -vf-add scale -vf-pre scale -vo x11  -ao null      -alang "" -slang "" -sub '/tmp/gambas.0/7993/SubSrt.srt.tmp' "mf:///home/root/.config/gambas3/Xt7-Player/SubBackImage*.bmp"
 
 
 
-* opensubtitles integration?
-* mettere lA CATEGORIA AUDIOVIDEO
-* trovare un modo per levare i messaggi di errore di mplayertag dai log
-* ordinare i canali quando si incolonnano nella griglia
-
 
 Se attivi un driver video, poi non si può più disabilitare se è
 disabled il checkbox...

xt7-player-mpv-0.24.392.tar.gz/_config.yml Added

xt7-player-mpv-0.22.391.tar.gz/_mpvstats.lua -> xt7-player-mpv-0.24.392.tar.gz/_mpvstats.lua Changed