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
x
1
2
-------------------------------------------------------------------3
+Tue Feb 14 13:30:27 UTC 2017 - avvissu@yandex.by4
+5
+- Update to 0.24.392:6
+ * see: /usr/share/doc/packages/xt7-player-mpv/CHANGELOG_GIT7
+- Spec file cleanup8
+9
+-------------------------------------------------------------------10
Wed Nov 23 15:37:29 UTC 2016 - avvissu@yandex.by11
12
- Update to 0.22.391:13
xt7-player-mpv.spec
Changed
93
1
2
#3
# spec file for package xt7-player-mpv4
#5
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.6
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.7
#8
# All modifications and additions to the file contributed by third parties9
# remain the property of their copyright owners, unless otherwise agreed10
11
12
13
Name: xt7-player-mpv14
-Version: 0.22.39115
+Version: 0.24.39216
Release: 017
Summary: Qt/Gambas gui to mpv18
License: GPL-2.0+19
20
BuildRequires: gambas3-gb-image21
BuildRequires: gambas3-gb-image-imlib22
BuildRequires: gambas3-gb-image-io23
+BuildRequires: gambas3-gb-libxml24
BuildRequires: gambas3-gb-net25
BuildRequires: gambas3-gb-net-curl26
+BuildRequires: gambas3-gb-qt527
+BuildRequires: gambas3-gb-qt5-ext28
BuildRequires: gambas3-gb-settings29
BuildRequires: gambas3-gb-signal30
BuildRequires: gambas3-gb-util-web31
BuildRequires: gambas3-gb-web32
-BuildRequires: gambas3-gb-libxml33
+BuildRequires: pkgconfig34
BuildRequires: pkgconfig(taglib)35
BuildRequires: pkgconfig(taglib_c)36
-# FIXME: Use %%requires_eq macro instead37
Requires: %(rpm -qf $(readlink -qne %{_libdir}/libtag.so) --qf '%{NAME} >= %{VERSION}')38
-# FIXME: Use %%requires_eq macro instead39
Requires: %(rpm -qf $(readlink -qne %{_libdir}/libtag_c.so) --qf '%{NAME} >= %{VERSION}')40
Requires: ffmpeg41
Requires: gambas3-gb-args42
43
Requires: gambas3-gb-gtk44
Requires: gambas3-gb-gui45
Requires: gambas3-gb-image46
+Requires: gambas3-gb-libxml47
Requires: gambas3-gb-net48
Requires: gambas3-gb-net-curl49
+Requires: gambas3-gb-qt550
+Requires: gambas3-gb-qt5-ext51
Requires: gambas3-gb-settings52
Requires: gambas3-gb-signal53
Requires: gambas3-gb-util-web54
Requires: gambas3-gb-web55
-Requires: gambas3-gb-libxml56
-Requires: gambas3-runtime >= 3.8.457
-Requires: mpv >= 0.21.058
+Requires: gambas3-runtime59
+Requires: mpv >= 0.24.060
Requires: wget61
Requires: youtube-dl62
Recommends: dvb63
64
Recommends: xbindkeys65
Recommends: xdg-utils66
BuildArch: noarch67
-%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 12010068
-BuildRequires: gambas3-gb-qt569
-BuildRequires: gambas3-gb-qt5-ext70
-Requires: gambas3-gb-qt571
-Requires: gambas3-gb-qt5-ext72
-%else73
-BuildRequires: gambas3-gb-qt474
-BuildRequires: gambas3-gb-qt4-ext75
-Requires: gambas3-gb-qt476
-Requires: gambas3-gb-qt4-ext77
-%endif78
79
%description80
Aims to be an (in)complete graphical interface to mpv, focused on81
82
%prep83
%setup -q84
85
-# Build with Qt486
-%if 0%{?suse_version} <= 1320 && !0%{?sle_version}87
-sed -i 's/gb\.qt5/gb.qt4/' .project88
-%endif89
-90
%build91
gbc3 -e -a -g -t -p -m92
gba393
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
201
1
2
#, fuzzy3
msgid ""4
msgstr ""5
-"Project-Id-Version: xt7-player-mpv 3.9.1\n"6
-"PO-Revision-Date: 2016-11-16 08:11 UTC\n"7
+"Project-Id-Version: xt7-player-mpv 3.9.2\n"8
+"PO-Revision-Date: 2017-02-14 09:15 UTC\n"9
"Last-Translator: kokoko3k <kokoko3k@gmail.com>\n"10
"Language: it\n"11
"MIME-Version: 1.0\n"12
13
msgid "Click for a list of URI prefixes"14
msgstr "Mostra la lista dei prefissi per le URI"15
16
-#: AddUriForm.form:51 FMain.class:903617
+#: AddUriForm.form:51 FMain.class:904118
msgid "cdda://"19
msgstr "-"20
21
22
msgid "Add the selected URI to Collection and/or Playlist"23
msgstr "Aggiungi l'URI selezionata alla collezione/playlist"24
25
-#: AddUriForm.form:152 FMain.class:9526 GeneralOptions.form:110826
+#: AddUriForm.form:152 FMain.class:9534 GeneralOptions.form:113027
msgid "Add"28
msgstr "Aggiungi"29
30
31
msgid "Close"32
msgstr "Chiudi"33
34
-#: AlbumView.class:94 FMain.class:140635
+#: AlbumView.class:94 FMain.class:140936
msgid "Unknown"37
msgstr "Sconosciuto"38
39
40
msgid "Title"41
msgstr "Titolo"42
43
-#: AudioConvert.class:95 FMain.class:1001544
+#: AudioConvert.class:95 FMain.class:1002445
msgid "Unable to get the real stream url"46
msgstr "Non posso recuperare l'url reale del flusso"47
48
49
msgid "Start"50
msgstr "Avvia"51
52
-#: AudioForm.class:13 FMain.form:691 FormLyrics.form:94 Searchfields.form:5853
+#: AudioForm.class:13 FMain.form:692 FormLyrics.form:94 Searchfields.form:5854
msgid "Artist"55
msgstr "Artista"56
57
-#: AudioForm.class:14 FMain.form:687 Searchfields.form:6658
+#: AudioForm.class:14 FMain.form:688 Searchfields.form:6659
msgid "Album"60
msgstr "Album"61
62
-#: AudioForm.class:15 FMain.form:2674 Searchfields.form:9063
+#: AudioForm.class:15 FMain.form:2681 Searchfields.form:9064
msgid "Year"65
msgstr "Anno"66
67
-#: AudioForm.class:17 FMain.form:2742 Searchfields.form:11968
+#: AudioForm.class:17 FMain.form:2749 Searchfields.form:11969
msgid "Comment"70
msgstr "Commento"71
72
73
msgid "Lyrics"74
msgstr "Testi"75
76
-#: AudioForm.class:29 FMain.form:221077
+#: AudioForm.class:29 FMain.form:221778
msgid "Radio"79
msgstr "Radio"80
81
82
msgid "Name"83
msgstr "Nome"84
85
-#: AudioForm.class:31 FMain.class:9025 Searchfields.form:10486
+#: AudioForm.class:31 FMain.class:9030 Searchfields.form:10487
msgid "Length"88
msgstr "Durata"89
90
-#: AudioForm.class:32 SubAndOsd.form:25091
+#: AudioForm.class:32 SubAndOsd.form:24992
msgid "Size"93
msgstr "Dimensione"94
95
96
97
#: BugReport.form:2998
msgid "<center>Oops, xt7 just crashed.<br></center>\n\nYou can this window to exit the program or submit a bug report <br>\nby using one of the following choices: <br>\n<br>\n<b> xt7 forums on sourceforge.net: <br></b>\n • free posting without the need to register <br>\n<br>\n<b> xt7 project page on GitHub.com: <br></b>\n • requires an account to post <br>\n • much better bug managment. <br>\n"99
-msgstr ""100
+msgstr "-\n"101
102
#: BugReport.form:48103
msgid "When you submit a bug report, please write what you were doing when the crash happened and include the following in your report."104
105
msgid ":"106
msgstr "-"107
108
-#: ChooseAspect.form:53 GeneralOptions.form:2427109
+#: ChooseAspect.form:53 GeneralOptions.form:2470110
msgid "="111
msgstr "-"112
113
114
msgstr "Test"115
116
#: CountDown.form:12117
-msgid "ShutDown CountDown..."118
-msgstr "Conto alla rovescia per lo spegnimento."119
+msgid "ShutDown CountDown"120
+msgstr "Conto alla rovescia per lo spegnimento"121
122
-#: CountDown.form:17 NewChains.class:548123
+#: CountDown.form:17 NewChains.class:560124
msgid "Abort"125
msgstr "Annulla"126
127
128
msgid "ShutDown in"129
msgstr "Spegnimento in"130
131
-#: CountDown.form:32132
-msgid "seconds..."133
-msgstr "secondi..."134
+#: CountDown.form:32 GeneralOptions.form:1631135
+msgid "seconds"136
+msgstr "secondi"137
138
#: CountDown.form:38139
msgid "10"140
141
msgid "Try to use less strict terms, remove symbols and so on..."142
msgstr "Prova ad usare termini meno stretti, rimuovi i simboli e così via..."143
144
-#: CoverManager.class:941145
+#: CoverManager.class:944146
msgid "Load a Jpg cover image"147
msgstr "Carica una copertina in formato jpg"148
149
-#: CoverManager.class:957150
+#: CoverManager.class:960151
msgid "Error while loading the picture"152
msgstr "Errore durante il caricamento dell' immagine"153
154
-#: CoverManager.class:991 FMain.class:7945155
+#: CoverManager.class:994 FMain.class:7950156
msgid "\nso you are going to set a cover for this particular file/stream"157
msgstr "\nQuindi la copertina che imposterai sarà solo per questo file o stream"158
159
-#: CoverManager.class:992 FMain.class:7946160
+#: CoverManager.class:995 FMain.class:7951161
msgid "Artist Or Album tag information are required to set a cover"162
msgstr "Le tag artista o album sono necessarie per impostare una copertina"163
164
165
msgid "Load cover"166
msgstr "Carica da disco"167
168
-#: CoverManager.form:178 GeneralOptions.form:3140169
+#: CoverManager.form:178 GeneralOptions.form:3184170
msgid "128"171
msgstr "-"172
173
-#: CoverManager.form:178 GeneralOptions.form:3140174
+#: CoverManager.form:178 GeneralOptions.form:3184175
msgid "160"176
msgstr "-"177
178
179
msgid "Set Cover"180
msgstr "Imposta"181
182
-#: DVBTuner.class:53 FMain.form:1763 GeneralOptions.form:1447183
+#: DVBTuner.class:53 FMain.form:1770 GeneralOptions.form:1504184
msgid "DVB-T"185
msgstr "-"186
187
188
msgid "Too bad..."189
msgstr "Peccato..."190
191
-#: DVBTuner.form:37 FMain.form:913192
+#: DVBTuner.form:37 FMain.form:914193
msgid "Simple Dvb-T Tuner"194
msgstr "Semplice tuner DVB-T"195
196
197
msgid "Import"198
msgstr "Importa"199
200
-#: DVBTuner.form:95 GeneralOptions.form:1982201
xt7-player-mpv-0.22.391.tar.gz/.list -> xt7-player-mpv-0.24.392.tar.gz/.list
Changed
5
1
2
+DBusObject_!3
MyDialog4
SettingsClass!5
xt7-player-mpv-0.22.391.tar.gz/.project -> xt7-player-mpv-0.24.392.tar.gz/.project
Changed
13
1
2
# Gambas Project File 3.03
-# Compiled with Gambas 3.9.14
+# Compiled with Gambas 3.9.25
Title=xt7-player6
Startup=StartClass7
Icon=xt7-player-mpv.png8
-Version=0.22.3919
+Version=0.24.39210
Component=gb.args11
Component=gb.image12
Component=gb.qt513
xt7-player-mpv-0.22.391.tar.gz/.settings -> xt7-player-mpv-0.24.392.tar.gz/.settings
Changed
201
1
2
Count=03
4
[DebugWindow]5
-Count=06
+Count=17
+DebugWindow[1]="devices"8
+9
+[DebugWindow/(Dir(Directory, "*"))]10
+Geometry=[1280,0,224,280]11
12
[DebugWindow/AComment]13
Geometry=[1280,0,224,280]14
15
[DebugWindow/Last]16
Geometry=[108,296,561,513]17
18
+[DebugWindow/Matches]19
+Geometry=[1280,0,224,280]20
+21
[DebugWindow/NewChains.parse_drivers(False)]22
Geometry=[1280,0,224,280]23
24
25
[DebugWindow/TabStrip_filters_audio.Current.Children[0]]26
Geometry=[94,42,239,516]27
28
+[DebugWindow/TheForm]29
+Geometry=[1280,0,433,529]30
+31
[DebugWindow/TheForm.controls]32
Geometry=[52,0,224,280]33
34
[DebugWindow/TheTabStrip]35
Geometry=[1280,0,224,280]36
37
+[DebugWindow/aArg]38
+Geometry=[1280,0,224,280]39
+40
+[DebugWindow/aSign]41
+Geometry=[1280,0,224,280]42
+43
[DebugWindow/aTabstrip]44
Geometry=[52,0,224,280]45
46
+[DebugWindow/aTabstrip.Tag]47
+Geometry=[52,0,224,280]48
+49
[DebugWindow/data]50
Geometry=[1280,0,224,280]51
52
+[DebugWindow/devices]53
+Geometry=[52,0,224,280]54
+55
[DebugWindow/driver_opts]56
Geometry=[1280,0,224,280]57
58
[DebugWindow/driver_opts[0]]59
Geometry=[1280,312,224,280]60
61
+[DebugWindow/forbackground]62
+Geometry=[52,0,224,280]63
+64
+[DebugWindow/hClass]65
+Geometry=[1335,369,224,280]66
+67
+[DebugWindow/hClass.Symbols]68
+Geometry=[1280,440,224,280]69
+70
+[DebugWindow/hClass[sSymbol]]71
+Geometry=[609,499,377,337]72
+73
+[DebugWindow/hsplit1.Layout]74
+Geometry=[400,147,224,280]75
+76
+[DebugWindow/hsplit1.layout]77
+Geometry=[400,147,224,280]78
+79
+[DebugWindow/i]80
+Geometry=[52,0,224,280]81
+82
+[DebugWindow/image.Load(tmpfile)]83
+Geometry=[52,0,224,280]84
+85
+[DebugWindow/img]86
+Geometry=[298,0,224,280]87
+88
+[DebugWindow/img.picture]89
+Geometry=[1280,0,224,280]90
+91
[DebugWindow/jdec]92
Geometry=[596,177,265,356]93
94
[DebugWindow/jdec["default-value"]]95
Geometry=[1294,14,224,280]96
97
+[DebugWindow/jdecoded]98
+Geometry=[52,0,224,280]99
+100
+[DebugWindow/jdecoded[0]]101
+Geometry=[66,14,224,280]102
+103
[DebugWindow/last_dynaobj_changed]104
Geometry=[688,443,224,280]105
106
107
[DebugWindow/myscrollview]108
Geometry=[666,279,224,280]109
110
+[DebugWindow/mystream]111
+Geometry=[52,0,224,280]112
+113
[DebugWindow/names]114
Geometry=[1280,0,224,280]115
116
[DebugWindow/new_opts]117
Geometry=[1280,0,581,744]118
119
+[DebugWindow/o]120
+Geometry=[52,0,378,804]121
+122
+[DebugWindow/o.Parent]123
+Geometry=[66,14,378,804]124
+125
[DebugWindow/obj]126
Geometry=[52,0,283,308]127
128
129
[DebugWindow/opts["vo"]]130
Geometry=[1280,0,224,280]131
132
+[DebugWindow/out]133
+Geometry=[1280,0,224,280]134
+135
[DebugWindow/out_bands]136
Geometry=[52,0,224,280]137
138
+[DebugWindow/prevlayout]139
+Geometry=[400,147,224,280]140
+141
[DebugWindow/prop]142
Geometry=[1280,0,224,280]143
144
[DebugWindow/properties]145
Geometry=[1280,0,224,280]146
147
+[DebugWindow/prova]148
+Geometry=[1280,0,224,280]149
+150
+[DebugWindow/prova[0]]151
+Geometry=[1294,14,224,280]152
+153
[DebugWindow/return_opts]154
Geometry=[1280,0,224,280]155
156
157
[DebugWindow/theobject]158
Geometry=[52,0,224,848]159
160
+[DebugWindow/tmppic]161
+Geometry=[52,0,224,280]162
+163
+[DebugWindow/tmppic.Image]164
+Geometry=[52,312,224,280]165
+166
[Executable]167
Path="xt7-player-mpv.gambas"168
169
[OpenFile]170
-File[1]=".src/Classi/IceCastClass.class:20.60"171
-File[2]=".src/Classi/MplayerClass.class:0.2404"172
-Active=3173
-File[3]=".src/Form/NewChains.class:12.1910"174
-Count=13175
+File[1]=".src/Classi/IceCastClass.class:62.197"176
+File[2]=".src/Classi/MplayerClass.class:6.2609"177
+Active=7178
+File[3]=".src/Form/NewChains.class:0.2223"179
+Count=28180
File[4]=".src/Form/FMain.form"181
-File[5]=".src/Form/FMain.class:25.1529"182
+File[5]=".src/Form/FMain.class:21.11263"183
File[6]=".src/Form/NewChains.form"184
-File[7]=".src/Form/GeneralOptions.class:24.111"185
-File[8]=".src/0_Moduli/Global.module:26.665"186
+File[7]=".src/Form/GeneralOptions.class:19.1608"187
+File[8]=".src/0_Moduli/Global.module:0.772"188
File[9]=".src/Form/GeneralOptions.form"189
File[10]=".src/Classi/FloatSpinBox.class:12.180"190
-File[11]="AA_ToDo:1.10"191
+File[11]="AA_ToDo:0.44"192
File[12]=".src/Classi/randr.class:0.165"193
-File[13]=".src/Classi/SettingsClass.class:31.142"194
+File[13]=".src/Classi/SettingsClass.class:0.293"195
+File[14]=".src/Form/ChooseAspect.class:17.21"196
+File[15]=".src/Classi/PlaylistClass.class:24.905"197
+File[16]=".src/Form/HotKeys.class:3.292"198
+File[17]=".src/Form/zzzFake.form"199
+File[18]=".src/Classi/StartClass.class:32.55"200
+File[19]=".src/Form/zzzFake.class:48.13"201
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
25
1
2
Public ScreenshotFolder As String 3
Public CurrentProfile As String 4
Public Historyfile As String5
+Public Bookmarksfile As String6
Public FormW As Integer 7
Public FormH As Integer 8
Public FormX As Integer 9
10
ScreenshotFolder = settings.defaultdir & "/" & Appname & "/" & ".xt7-screenshots/"11
YPCacheFile = settings.defaultdir & "/" & Appname & "/" & ".ypcachefile"12
HistoryFile = settings.defaultdir & "/" & Appname & "/" & ".history.txt"13
+ BookmarksFile = settings.defaultdir & "/" & Appname & "/" & ".bookmarks.txt"14
CurrentProfile = ""15
FormW = 400 'As gambas does not update form dimesions on fullscreen switch16
FormH = 300 'we have TO DO it manually17
18
19
Public Sub LoadAllSettings(ProfileName As String) 'THIS Is PROBABLY BROKEN20
Dim MySettings As New SettingsClass21
-22
MySettings.Load(Fmain, Global.confpath & "/" & ProfileName)23
MySettings.Load(GeneralOptions, Global.confpath & "/" & ProfileName)24
25
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
9
1
2
3
Inherits DBusObject4
5
+6
Create Static7
8
9
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
94
1
2
3
Public Function IsSubFile(SubfilePath As String) As Boolean4
5
- Dim SubExtensions As String = "*.SRT;*.ASS;*.SUB;*.SSA;"6
+ Dim SubExtensions As String = "*.SRT;*.ASS;*.SUB;*.SSA;*.SCC"7
Dim fileExt As String = "." & File.Ext(SubfilePath)8
9
If Fileext = "." Then Return False10
11
'Create the thumb, but exit after 30 seconds 12
cmdline = executable(5) & " " & Shell(fullpath) & " --cache=no "13
cmdline &= "-vf scale=" & width & ":-2" & ",expand=::::1/1" & " --no-sub" & " --start " & seconds 14
- cmdline &= " -frames 1 --no-audio --vo=image:format=jpg:jpeg-quality=80:outdir=" & outdir15
+ cmdline &= " -frames 1 --no-audio --vo=image --vo-image-format=jpg --vo-image-jpeg-quality=80 --vo-image-outdir=" & outdir16
cmdline &= " --config=no -quiet &>/dev/null"17
18
newfilenamepriv = newfilename19
20
21
If af_current <> af_new Then 22
af_new = fix_for_anequalizer(af_new)23
+ af_new = fix_for_compand(af_new)24
set_property_mpv("af", af_new, True)25
af_current = af_new26
+ File.Save("/tmp/out.txt", af_new)27
Endif28
29
ReturnLabel:30
31
32
End33
34
+Private Function fix_for_compand(af As String) As String35
+ Dim istart, iend As Integer36
+ Dim sOut As String37
+38
+' "lavfi=[compand=" & eqstring(False) & ]" this way it works in realtime only39
+' lavfi=[compand=" & eqstring(False) & "] this way it works at start40
+ istart = InStr(af, "\"lavfi=[compand")41
+ 42
+ If istart = 0 Then Return af43
+44
+ iend = InStr(af, "]\"", istart)45
+ If iend = 0 Then Return af 'something wrong...46
+ sOut = Left(af, istart - 1) & Mid(af, istart + 1, iend - Len(af)) & Right(af, - iend - 1)47
+48
+ Return sout49
+End50
+51
Private Function fix_for_anequalizer(af As String) As String52
Dim istart, iend As Integer53
Dim sOut As String54
55
56
If istart = 0 Then Return af57
58
- iend = InStr(af, "]\"")59
+ iend = InStr(af, "]\"", istart)60
If iend = 0 Then Return af 'something wrong...61
sOut = Left(af, istart - 1) & Mid(af, istart + 1, iend - Len(af)) & Right(af, - iend - 1)62
63
64
Public Function audio_add(filename As String)65
mpv_command(["audio-add", filename])66
End67
+68
+Public Function get_offline_property(p As String) As String69
+ Dim out As String70
+ Dim cmd As String71
+ cmd = "echo -e print_text '${" & p & "} \n quit' | " & executable(5) & " --idle=yes --input-file=/dev/stdin" 72
+ Shell cmd To out73
+ Return out74
+End75
+76
+Public Function audio_devices_list(Optional separator As String = " ~ ") As String[]77
+ Dim devices As New String[]78
+ Dim j, name, desc As String 79
+ Dim jdecoded As New Collection[]80
+ Dim i As Integer81
+ j = get_offline_property("=audio-device-list")82
+ If Trim(j) = "" Then Return Null83
+ Try jdecoded = json.Decode(j)84
+ If Error Then Return Null85
+ If jdecoded.count = 0 Then Return Null86
+ For i = 0 To jdecoded.max87
+ name = jdecoded[i]["name"]88
+ desc = jdecoded[i]["description"]89
+ devices.Add(name & separator & desc)90
+ Next91
+ Return devices92
+End93
+94
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
10
1
2
3
Public Function IsSubFile(SubfilePath As String) As Boolean4
5
- Dim SubExtensions As String = "*.SRT;*.ASS;*.SUB;*.SSA;"6
+ Dim SubExtensions As String = "*.SRT;*.ASS;*.SUB;*.SSA;*.SCC"7
Dim fileExt As String = "." & File.Ext(SubfilePath)8
9
If Fileext = "." Then Return False10
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
201
1
2
3
Inherits DBusObject4
5
+6
Create Static7
+' Event org_freedesktop_DBus_Properties_PropertiesChanged(args As String[])8
9
10
-''org.freedesktop.Dbus.Introspectable-------------------------------------------------------------------------------------------------------------11
+Public Sub emit_propertychanged()12
+' Dim args As New Collection[]13
+' Dim prova As New String[]14
' 15
-' Public Function org_freedesktop_Dbus_Introspectable_Introspect() As String16
-' Return "NULL"17
-' End18
' 19
-' ''org.freedesktop.Dbus.Properties-----------------------------------------------------------------------------------------------------------------20
-' Public Function org_freedesktop_Dbus_Properties_Get(Myinterface As String, MyProperty As String) As String21
-' Return "NULL"22
-' End23
-' Public Function org_freedesktop_Dbus_Properties_Set(Myinterface As String, MyProperty As String) As String24
-' Return "NULL"25
-' End26
-' Public Function org_freedesktop_Dbus_Properties_GetAll(Myinterface As String, MyProperty As String) As String[]27
-' Return "NULL"28
-' End29
+' 'prova.add(org_mpris_MediaPlayer2_Player_Metadata_Read())30
+' prova.Add("a")31
+' Debug "a"32
+' Debug prova[0] 33
+' Debug "a"34
+' 'type mismatch?35
+' DBus["/org/mpris/MediaPlayer2"].Raise(mpris, "org.freedesktop.DBus.Properties.PropertiesChanged", prova)36
+37
+End38
39
40
''ORG.MPRIS.MEDIAPLAYER2-----------------------------------------------------------------------------------------------------------------41
42
Property Read org_mpris_MediaPlayer2_SupportedMimeTypes As String[]43
44
Function org_mpris_MediaPlayer2_CanQuit_Read() As Boolean45
+ 'debug "Dbus"46
Return True47
End48
49
Function org_mpris_MediaPlayer2_CanRaise_Read() As Boolean50
+ 'debug "Dbus"51
Return True52
End53
54
Function org_mpris_MediaPlayer2_HasTrackList_Read() As Boolean55
+ 'debug "Dbus"56
Return True57
End58
59
Function org_mpris_MediaPlayer2_Identity_Read() As String60
- Return "xt7-player"61
+ 'debug "Dbus"62
+ Return "xt7-player-mpv"63
End64
65
Function org_mpris_MediaPlayer2_DesktopEntry_Read() As String66
- Return "xt7-player"67
+ 'debug "Dbus"68
+ Return "xt7-player-mpv"69
End70
71
Function org_mpris_MediaPlayer2_SupportedUriSchemes_Read() As String[]72
+ 'debug "Dbus"73
Return ["file", "http"]74
End75
76
Function org_mpris_MediaPlayer2_SupportedMimeTypes_Read() As String[]77
+ 'debug "Dbus"78
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"]79
End80
81
Public Function org_mpris_MediaPlayer2_Raise() 82
- FMain.raise83
+ 'debug "Dbus"84
+ FMain.Show()85
End86
87
Public Function org_mpris_MediaPlayer2_Quit()88
+ 'debug "Dbus"89
'we cannot just quit the application, because it would unregister90
'dbus before we exit this kifunction, leading to a runtime error91
'so use a timer to program a delayed quit.92
93
Property org_mpris_MediaPlayer2_Player_LoopStatus As String94
Property org_mpris_MediaPlayer2_Player_Rate As Float95
Property org_mpris_MediaPlayer2_Player_Shuffle As Boolean96
-Property Read org_mpris_MediaPlayer2_Player_Metadata As String[] 'controllare bene il tipo di dato97
+Property Read org_mpris_MediaPlayer2_Player_Metadata As Collection98
Property org_mpris_MediaPlayer2_Player_Volume As Float99
Property Read org_mpris_MediaPlayer2_Player_Position As Long100
Property Read org_mpris_MediaPlayer2_Player_MinimumRate As Float101
102
103
104
Function org_mpris_MediaPlayer2_Player_PlayBackStatus_Read() As String105
+ Dim processrunning As Boolean = False106
+ 'debug "Dbus"107
+ Try processrunning = FMain.mplayer.ProcessRunningOvr() 108
+ If Not processrunning Then Return "Stopped"109
+ If FMain.mplayer.paused(True) Then Return "Paused"110
+ Return "Playing"111
End112
113
Function org_mpris_MediaPlayer2_Player_LoopStatus_Read() As String114
+'debug "Dbus"115
If FMain.TogglePls.value Then 116
Return "Playlist"117
Else118
119
End120
121
Function org_mpris_MediaPlayer2_Player_LoopStatus_Write(p As String)122
+'debug "Dbus"123
FMain.TogglePls.value = (p = "Playlist")124
End125
126
Function org_mpris_MediaPlayer2_Player_Rate_Read() As Float127
+ Dim out As String128
+ Dim fout As Float129
+ 'debug "Dbus"130
+ If Not FMain.mplayer.ProcessRunningOvr() Then Return 1131
+ out = FMain.mplayer.get_property_mpv("speed",,, True)132
+ Try fout = CFloat(out)133
+ If Not Error Then Return fout134
+ Return 1135
End136
137
Function org_mpris_MediaPlayer2_Player_Rate_Write(p As Float) 138
+ 'debug "Dbus"139
End140
141
Function org_mpris_MediaPlayer2_Player_Shuffle_Read() As Boolean142
+ 'debug "Dbus"143
Return FMain.ShufflePls.value144
End145
146
Function org_mpris_MediaPlayer2_Player_Shuffle_Write(p As Boolean) 147
+ 'debug "Dbus"148
FMain.ShufflePls.value = p149
End150
151
-Function org_mpris_MediaPlayer2_Player_Metadata_Read() As String[]152
+Function org_mpris_MediaPlayer2_Player_Metadata_Read() As Collection153
+ Dim out As Collection154
+ 155
+ out = New Collection156
+ out["xesam:url"] = "/my/track_" & CString(Rnd(0, 10000)) 'FMain.mplayer.getP("fullpath")157
+ out["mpris:trackid"] = "/path/to/dbus/boh" 'probably wrong type, should be "objectpath"158
+159
+ If FMain.mplayer.ProcessRunningOvr() Then 160
+ Try out["mpris:length"] = CLong(FMain.mplayer.get_property_mpv("=duration", True, 1, True) * 1000000)161
+ Endif162
+ 163
+ Return out164
+165
End166
167
Function org_mpris_MediaPlayer2_Player_Volume_Read() As Float168
+'debug "Dbus"169
Return (FMain.SaveVolumeSlider.value * (100 Div FMain.SaveVolumeSlider.MaxValue))170
End171
172
-Function org_mpris_MediaPlayer2_Player_Volume_Write(p As Float)173
- If p <= 0 Then174
- FMain.volume_set("0")175
- Else176
- FMain.volume_set(CStr(p * 100))177
- Endif178
-End179
+180
181
Function org_mpris_MediaPlayer2_Player_Position_Read() As Long182
+ 'debug "Dbus"183
+ If Not (FMain.mplayer.ProcessRunningOvr()) Then Return184
+ Return FMain.mplayer.CurrentTime(True) * 1000000185
End186
187
Function org_mpris_MediaPlayer2_Player_Position_Write() As Long188
+'debug "Dbus"189
End190
191
Function org_mpris_MediaPlayer2_Player_MinimumRate_Read() As Float192
+ Return "0.01"193
+'debug "Dbus"194
End195
196
Function org_mpris_MediaPlayer2_Player_MaximumRate_Read() As Float197
+ Return "1000"198
+'debug "Dbus"199
End200
201
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
19
1
2
3
{ Form Form4
MoveScaled(0,0,36,16)5
- Text = ("ShutDown CountDown...")6
+ Text = ("ShutDown CountDown") & "..."7
{ AbortBTN Button8
MoveScaled(10,10,16,5)9
AutoResize = True10
11
}12
{ Label2 Label13
MoveScaled(0,6,36,4.5714)14
- Text = ("seconds...")15
+ Text = ("seconds") & "..."16
Alignment = Align.Center17
}18
{ SecondsLabel Label19
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
112
1
2
End3
4
Public Function LookForJpg(filename As String, Optional saveto As String = "", Optional ByRef fileerror As Boolean = False) As Boolean5
- Dim mystream As File6
- Dim myjpg As String = ""7
- Dim m1 As String = "image/"8
- Dim isvalid As Boolean = False9
- Dim tmpfile As String = Temp & ".jpg"10
- Dim tmppic As Picture11
- Dim chunk As String12
- Dim m1pos As Long13
- Dim jpgstartmarker As String = Chr(255) & Chr(216) 'FFD814
- Dim jpgendmarker As String = Chr(255) & Chr(217) 'FFD915
- Dim jpgstart, jpgend As Long16
- 17
+ Dim mystream As File18
+ Dim myjpg As String = ""19
+ Dim m1 As String = "image/"20
+ Dim isvalid As Boolean = False21
+ Dim tmpfile As String = Temp & ".jpg"22
+ Dim tmppic As Picture23
+ Dim chunk As String24
+ Dim m1pos As Long25
+ Dim jpgstartmarker As String = Chr(255) & Chr(216) 'FFD826
+ Dim jpgendmarker As String = Chr(255) & Chr(217) 'FFD927
+ Dim jpgstart, jpgend As Long28
+29
If IsUncovered(filename) Then Return False30
31
Try mystream = Open filename For Input32
33
34
myjpg = Read #mystream, (jpgend - jpgstart) 35
file.Save(tmpfile, myjpg)36
- Try tmppic = picture.Load(tmpfile)37
+ Try tmppic = image.Load(tmpfile).picture38
If Not Error Then 39
isvalid = True40
+ Stop41
Seek #mystream, jpgstart42
Else43
Seek #mystream, jpgend44
45
Seek #mystream, jpgstart46
47
myjpg = Read #mystream, (jpgend - jpgstart) 48
+ Stop49
+ 50
file.Save(tmpfile, myjpg)51
Try tmppic = picture.Load(tmpfile)52
If Not Error Then 53
54
55
56
For Each sFile In (Dir(Directory, "*"))57
+58
+ If sFile Like "*.png" Then Stop59
For Each sMatch In Matches60
If sFile Like sMatch Then 61
+ 62
folderpictures.Add(sFile, directory)63
Return sFile64
Endif65
66
End67
68
69
-70
Public Sub EmbeddedToCoverCache(artist As String, album As String, fullpath As String, coverfilename As String, mygrid As Gridview, row As Integer, column As Integer)71
Select Case Lower(file.Ext(fullpath))72
Case "mp3"73
- LookForJpg(fullpath, coverfilename)74
- Try mygrid[row, column].text = ""75
- Try mygrid[row, column].clear76
+ makevideothumb(fullpath, coverfilename, mygrid, row, column, 1)77
+ 'LookForJpg(fullpath, coverfilename)78
+ 'Try mygrid[row, column].text = ""79
+ 'Try mygrid[row, column].clear80
Return81
Case "ogg"82
+ LookForJpg(fullpath, coverfilename)83
If LookForJpgb64(fullpath, coverfilename) Then 84
Try mygrid[row, column].text = ""85
Try mygrid[row, column].clea86
87
88
89
Private lastthumbpath As String = ""90
-Public Sub makevideothumb(fullpath As String, coverfilepath As String, mygrid As Gridview, row As Integer, column As Integer)91
+Public Sub makevideothumb(fullpath As String, coverfilepath As String, mygrid As Gridview, row As Integer, column As Integer, Optional seconds As Integer = 300)92
If fullpath = lastthumbpath Then Return93
lastthumbpath = fullpath94
95
96
mplayerthumb = New Mplayerclass As "thumbnailer"97
runningthumblers += 198
global.myDebug(runningthumblers)99
- mplayerthumb.savethumb(fullpath, coverfilepath,,, mygrid, row, column)100
+ mplayerthumb.savethumb(fullpath, coverfilepath,, seconds, mygrid, row, column)101
End102
103
104
105
g.refresh106
Wait107
global.myDebug(runningthumblers)108
+ UnMarkUncovered(fullpath)109
End110
111
Public Sub thumbnailer_ThumbErrorFor(fullpath As String, g As Gridview, r As Integer, c As Integer)112
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
17
1
2
MoveScaled(1,10,22,41)3
Expand = True4
}5
- { HttpClient1 #HttpClient6
- #MoveScaled(2,15)7
- }8
{ ProgressBar1 ProgressBar9
MoveScaled(1,52,14,4.5714)10
}11
+ { HttpClient1 #HttpClient12
+ #MoveScaled(2,15)13
+ }14
}15
{ VBox3 VBox16
MoveScaled(26,-3,64,63)17
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
113
1
2
MoveScaled(25,0,3,3)3
Expand = True4
}5
- { Timer1 #Timer6
- #MoveScaled(30,2)7
- Delay = 18
- }9
{ Panel2 Panel10
MoveScaled(38,1,48,5.7143)11
AutoResize = True12
{ ClockLabel2 TextLabel13
- MoveScaled(-7.2857,0.2857,54,5.7143)14
+ MoveScaled(-8.2857,0.2857,54,5.7143)15
Font = Font["Bold,18"]16
Foreground = &H000000&17
AutoResize = True18
19
Transparent = True20
}21
}22
+ { Timer1 #Timer23
+ #MoveScaled(30,2)24
+ Delay = 125
+ }26
}27
{ Separator2 Separator28
MoveScaled(36,12,53,2)29
30
Background = &H6992AE&31
}32
}33
- { InfoPanelShadow PictureBox34
- MoveScaled(24,7,38,35)35
- Visible = False36
- Ignore = True37
- Picture = Picture["shadowframe.png"]38
- Stretch = True39
- }40
- { pictureshadelow PictureBox Pictureshade41
- Name = "pictureshadelow"42
- MoveScaled(22,35,54,9)43
- Ignore = True44
- Picture = Picture["shadelowEPG.png"]45
- Stretch = True46
- }47
- { pictureshadeleft PictureBox Pictureshade48
- Name = "pictureshadeleft"49
- MoveScaled(22,-4,7,48)50
- Ignore = True51
- Picture = Picture["shadeleft.png"]52
- Stretch = True53
- }54
- { pictureshaderight PictureBox Pictureshade55
- Name = "pictureshaderight"56
- MoveScaled(69,-4,7,48)57
- Ignore = True58
- Picture = Picture["shaderight.png"]59
- Stretch = True60
- }61
- { pictureshadeup PictureBox Pictureshade62
- Name = "pictureshadeup"63
- MoveScaled(22,1,54,9)64
- Ignore = True65
- Picture = Picture["shadeupEPG.png"]66
- Stretch = True67
- }68
{ InfoPanel Panel MyInfoPanel69
Name = "InfoPanel"70
MoveScaled(16,1,49,43)71
72
Transparent = True73
}74
}75
+ { pictureshadeup PictureBox Pictureshade76
+ Name = "pictureshadeup"77
+ MoveScaled(22,1,54,9)78
+ Ignore = True79
+ Picture = Picture["shadeupEPG.png"]80
+ Stretch = True81
+ }82
+ { pictureshaderight PictureBox Pictureshade83
+ Name = "pictureshaderight"84
+ MoveScaled(69,-4,7,48)85
+ Ignore = True86
+ Picture = Picture["shaderight.png"]87
+ Stretch = True88
+ }89
+ { pictureshadeleft PictureBox Pictureshade90
+ Name = "pictureshadeleft"91
+ MoveScaled(22,-4,7,48)92
+ Ignore = True93
+ Picture = Picture["shadeleft.png"]94
+ Stretch = True95
+ }96
+ { pictureshadelow PictureBox Pictureshade97
+ Name = "pictureshadelow"98
+ MoveScaled(22,35,54,9)99
+ Ignore = True100
+ Picture = Picture["shadelowEPG.png"]101
+ Stretch = True102
+ }103
+ { InfoPanelShadow PictureBox104
+ MoveScaled(24,7,38,35)105
+ Visible = False106
+ Ignore = True107
+ Picture = Picture["shadowframe.png"]108
+ Stretch = True109
+ }110
}111
{ HBox4 HBox112
MoveScaled(33,66,79,0.7143)113
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
201
1
2
global.initearlyformsdone = True3
SubAndOsd.Init()4
GeneralOptions.Init()5
- generaloptions.BackColorChooseBTN2.background = Color.Merge(Color.TextBackground, Color.black, 0.1)6
+ generaloptions.BackColorChooseBTN2.background = Color.Merge(Color.TextBackground, Color.black, 0.05)7
Try Last.mouse = mouse.default8
fmain.mouse = mouse.default9
global.myDebug("Ends at:" & Time)10
11
Endif12
Endif13
Endif14
+15
If entry Like ("*" & sep & "*") Then16
Try RecentFileEntry.caption = Split(entry, sep, "", True, "")[0]17
If Error Then Return18
19
If Error Then Return20
Else21
RecentFileEntry.caption = entry22
+ RecentFileEntry.tag = entry23
Endif24
RecentFileEntry.Picture = picture["icon:/medium/recent"]25
Next 'entry26
27
Endif28
Try UrlBox.text = path29
Try FileView1.dir = path30
+ Wait31
gridpanels_arrange()32
FileView1.ShowDetailed = True33
34
35
36
Dim PrevScreenX As Integer = fmain.screenx37
Dim PrevScreeny As Integer = fmain.screeny38
- 39
- If (GeneralOptions.SaveGeometryCHK.value = True) Then40
- SubSaveFormGeometry(fmain.x - fmain.screenx, fmain.y - fmain.screeny)41
- Endif42
-43
+ SubSaveFormGeometry(fmain.x - fmain.screenx, fmain.y - fmain.screeny)44
End45
46
Public Sub SubSaveFormGeometry(offsetx As Integer, offsety As Integer)47
48
'primary49
SubMenu = New Menu(PrimaryMenu) As "MenuswitchsubPrimary"50
SubMenu.name = "SubMenuID" & i51
- SubMenu.caption = mplayer.getP("subtitletracks")[i]52
+ SubMenu.tag = mplayer.getP("subtitletracks")[i]53
+ SubMenu.caption = submenu.tag54
'secondary55
SubMenu = New Menu(SecondaryMenu) As "MenuswitchsubSecondary"56
SubMenu.name = "SubMenuID" & i57
- SubMenu.caption = mplayer.getP("subtitletracks")[i]58
+ submenu.tag = mplayer.getP("subtitletracks")[i]59
+ SubMenu.caption = submenu.tag60
Next 'i61
Endif62
63
64
brother.checked = False65
Next66
Last.checked = True67
- sid = Split(Last.caption, " ", "", True)[0]68
+ sid = Split(Last.tag, " ", "", True)[0]69
mplayer.set_property_mpv("secondary-sid", sid)70
- mplayer.ShowText(("Secondary subtitle") & ": " & Last.caption)71
+ mplayer.ShowText(("Secondary subtitle") & ": " & Last.tag)72
End73
74
75
76
brother.checked = False77
Next78
Last.checked = True79
- sid = Split(Last.caption, " ", "", True)[0]80
+ sid = Split(Last.tag, " ", "", True)[0]81
mplayer.set_property_mpv("sid", sid)82
- mplayer.ShowText(("Primary subtitle") & ": " & Last.caption)83
+ mplayer.ShowText(("Primary subtitle") & ": " & Last.tag)84
End85
86
87
88
global.myDebug("Error setting up dbus")89
Return90
Endif91
- 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"])92
+ '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"])93
+ 'Try DBus.Session.Register(mpris, "/org/mpris/MediaPlayer2", ["org.mpris.MediaPlayer2", "org.mpris.MediaPlayer2.Player", "org.freedesktop.Dbus.Properties", "org.freedesktop.Dbus.Introspectable"])94
+ Try DBus.Session.Register(mpris, "/org/mpris/MediaPlayer2", ["org.mpris.MediaPlayer2", "org.mpris.MediaPlayer2.Player"])95
If Error Then 96
global.myDebug("Error setting up dbus")97
Return98
99
End Select100
101
Returnlabel:102
+ If DbusAlreadyRegistered Then 'cercami103
+ mpris.emit_propertychanged() 'cercami104
+ Endif105
+ 106
Return107
108
End109
110
111
If tabselectedbrowse() Then112
Wait 113
- 'FileView1_beforeArrange()114
gridpanels_arrange()115
Endif116
117
118
Private Sub HideScrollbars(librarygrid As Gridview)119
120
librarygrid.Scrollbar = Scroll.none121
+ Wait122
GridPanels_Arrange() 'pre123
124
End125
126
End127
128
Public Sub MenuEmbeddedCoversPls_click()129
- UpdateCoverFromSelected(playlistgrid, playlistclass)130
+ UpdateCoverFromSelected(playlistgrid, myplaylist)131
End132
133
Public Sub MenuPlsSetCover_click()134
135
Dim r As Integer136
Dim coverfilename As String137
Dim fullpath, album, artist As String138
- 139
If MyQuestion.Ask(("xt7 will try to update the cover,\nBeware that covers set by you will be lost."), "Ok", "Cancel") = 2 Then Return140
mygrid.mouse = mouse.wait141
mygrid.enabled = False142
143
If String.Right(FileView1.dir, 1) = "/" Then FileView1.dir = String.Left(FileView1.dir, Len(FileView1.dir) - 1)144
FileView1.dir = File.dir(FileView1.dir)145
urlbox.text = Replace(FileView1.dir, "//", "/")146
+ Wait147
gridpanels_arrange()148
Object.unLock(urlbox)149
End150
151
Try selecteditem = FileView1.Selection[0]152
If IsDir(fullpathitem) Then153
FileView1.dir = fullpathitem154
+ Wait155
gridpanels_arrange()156
urlbox.text = Replace(FileView1.dir, "//", "/")157
If String.Right(urlbox.text, 1) = "/" Then urlbox.text = String.Left(urlbox.text, Len(urlbox.text) - 1)158
159
If (key.code = key.enter) Or (key.code = key.Return) Then160
If Urlbox.text <> FileView1.dir Then161
FileView1.dir = Urlbox.text162
+ Wait163
gridpanels_arrange()164
Endif165
Endif166
167
168
If Trim(Urlbox.text) = "" Then Urlbox.text = "/"169
FileView1.dir = Urlbox.text170
+ Wait171
gridpanels_arrange()172
End173
174
175
176
prevlayout = hsplit1.Layout177
Wait 0.025178
- If prevlayout[0] <> hsplit1.layout[0] Then Return179
+ If hsplit1.Layout.count > 0 Then180
+ If prevlayout.count > 0 Then181
+ If prevlayout[0] <> hsplit1.layout[0] Then Return 182
+ Endif183
+ Endif184
+ 185
186
timerhideshowvideo.start187
188
189
shadeup.x = brother.x + dltx 190
Try shadeup.y = brother.clienty + brother.Columns.Height + dlty191
If Error Then Try shadeup.y = brother.clienty + dlty192
- ' If (brother.Scrollbar = Scroll.Both Or brother.Scrollbar = Scroll.Horizontal) Then193
- ' shadelow.y = brother.clienty + brother.clienth - shadelow.h + 2 + dlty194
- ' Else195
- ' shadelow.y = brother.clienty + brother.h - shadelow.h + 2 + dlty196
- ' Endif197
Try shadeup.w = brother.clientw + 2198
- ' shadelow.w = brother.clientw + 2199
End200
201
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
129
1
2
Orientation = Align.Left3
Index = 04
Text = ("Library")5
- Picture = Picture["icon:/16/book"]6
+ Picture = Picture["icon:/small/book"]7
{ NOPARSETABLIBRARY Label8
MoveScaled(1,1,8,3)9
Visible = False10
11
}12
Index = 313
Text = ("Browse")14
- Picture = Picture["icon:/16/directory"]15
+ Picture = Picture["icon:/small/directory"]16
{ NOPARSETABBROWSE Label17
MoveScaled(1,1,8,3)18
Visible = False19
20
Margin = True21
Padding = 122
{ Button_mounts Button23
- MoveScaled(1,0,4,4.5714)24
+ MoveScaled(0,0,4,4.5714)25
+ ToolTip = ("Mounted devices")26
+ Picture = Picture["icon:/small/computer"]27
+ }28
+ { Button_bookmarks Button29
+ MoveScaled(5,0,4,4.5714)30
ToolTip = ("Mounted devices")31
- Picture = Picture["icon:/16/computer"]32
+ Picture = Picture["icon:/small/bookmark"]33
}34
{ ButtonUp Button35
MoveScaled(10,0,4,4.5714)36
ToolTip = ("Parent")37
- Picture = Picture["icon:/16/up"]38
+ Picture = Picture["icon:/small/up"]39
}40
{ UrlBox ComboBox41
MoveScaled(15,0,7,4.5714)42
43
{ ButtonRefresh Button44
MoveScaled(24,0,4,4.5714)45
ToolTip = ("Refresh")46
- Picture = Picture["icon:/16/refresh"]47
+ Picture = Picture["icon:/small/refresh"]48
}49
{ ButtonHidden Button50
MoveScaled(29,0,4,4.5714)51
ToolTip = ("Show/Hide hidden files")52
- Picture = Picture["icon:/16/watch"]53
+ Picture = Picture["icon:/small/watch"]54
}55
}56
{ Panel16 Panel gridpanels57
58
}59
{ shadeup PictureBox shadeuplow60
Name = "shadeup"61
- MoveScaled(-6,0,31,2)62
+ MoveScaled(0,2,31,2)63
Visible = False64
Ignore = True65
Picture = Picture["shadeup.png"]66
67
}68
Index = 469
Text = ("Chapters")70
- Picture = Picture["icon:/16/view-detail"]71
+ Picture = Picture["icon:/small/view-detail"]72
{ NOPARSETABCHAPTERS Label73
MoveScaled(0,0,8,3)74
Visible = False75
76
}77
Index = 778
Text = ("DVD")79
- Picture = Picture["icon:/16/cdrom"]80
+ Picture = Picture["icon:/small/cdrom"]81
{ NOPARSETABDVD Label82
MoveScaled(2,1,8,3)83
Visible = False84
85
Text = ("Order by")86
}87
{ ComboBoxOrderBy ComboBox88
- MoveScaled(9.4286,-46.2857,18,4.5714)89
+ MoveScaled(9.4286,-49.2857,18,4.5714)90
#Translate = False91
Expand = True92
ReadOnly = True93
94
}95
Index = 1396
Text = ("Profiles")97
- Picture = Picture["icon:/16/properties"]98
+ Picture = Picture["icon:/small/properties"]99
{ NOPARSETABPROFILES Label100
MoveScaled(2,1,8,3)101
Visible = False102
103
MoveScaled(0,0,4,4.5714)104
ToolTip = ("Show and select the possible search fields")105
AutoResize = True106
- Picture = Picture["icon:/16/find"]107
+ Picture = Picture["icon:/small/find"]108
}109
{ SearchField ComboBox110
MoveScaled(5,0,5,4.5714)111
112
MoveScaled(24,0,5,4.5714)113
Background = Color.Background114
ToolTip = ("Show media info when hovering a list item.")115
- Picture = Picture["icon:/16/info"]116
+ Picture = Picture["icon:/small/info"]117
Value = True118
}119
}120
121
MoveScaled(31,0,5,4.5714)122
Background = Color.Background123
ToolTip = ("Play next media as the previous reaches the end.")124
- Picture = Picture["icon:/16/end"]125
+ Picture = Picture["icon:/small/end"]126
}127
}128
}129
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
133
1
2
myopts.Add(newopt("demuxer-lavf-probesize", comboboxtsprobe.text))3
Endif4
5
- 6
+ 'audio-device7
+ myopts.Add(newopt("audio-device", Split(nopParseaudiodevicecombo.text, "~")[0]))8
+ 9
'audio passthrough10
For Each option In noparsevboxpt.Children11
If option Is Togglebutton Then12
13
myopts.Add(newopt("osd-level", "0"))14
myopts.Add(newopt("osd-color", "#00000000"))15
myopts.Add(newopt("osd-scale", "0.01"))16
-17
- If global.mpv_version = "" Then global.mpv_version = fmain.mplayer.version()18
- If global.mpv_version = "0.21.0" Then19
- myopts.Add(newopt("hr-seek", "yes"))20
- Endif21
- 22
+ myopts.Add(newopt("hr-seek", "yes"))23
Endif24
Return myopts25
End26
27
28
29
30
-31
-32
-Public Sub NopParseAudioDeviceCombo_Enter()33
- Dim d, ad, t As String34
- t = Last.text35
- If NopParseAudioDeviceCombo.count < 2 Then36
- Shell fmain.mplayer.executable(5) & " --audio-device=help " To ad37
- For Each d In Split(ad, "\n", "", True)38
- Try NopParseAudioDeviceCombo.Add(Split(d, "'", "", True)[1])39
- Try global.myDebug(Split(d, "'", "", True)[1])40
- Next41
- Endif42
- Last.text = t43
-44
-End45
-46
-47
-48
Public Sub ScrollViewUserOptions_Arrange()49
Dim o As Object50
Dim c As Combobox51
52
End53
54
55
+' Public Sub GetAlsaDevices() As String[]56
+' Dim acard, acardid, acardname, apcm, apcminfo, apcminfos, apcmid As String57
+' Dim adevices As New String[]58
+' Dim apcms As New String[]59
+' Dim acards As New String[]60
+' Dim sep As String = Chr(126)61
+' adevices.Add("plug:dmix" & " " & sep & " " & "(" & ("Default device, software mixing") & ")")62
+' adevices.Add("default" & " " & sep & " " & "(" & ("Default alsa device") & ")")63
+' adevices.Add("spdif" & " " & sep & " " & "(" & ("Default S/PDIF device") & ")")64
+' adevices.Add("hdmi" & " " & sep & " " & "(" & ("Default hdmi device") & ")")65
+' Try acards = Dir("/proc/asound/", "card*", gb.directory)66
+' If Not Error Then67
+' For Each acard In acards68
+' Try acardname = Trim(File.Load("/proc/asound/" & acard & "/id"))69
+' If Error Then acardname = "Unknown Card"70
+' acardid = Replace(acard, "card", "")71
+' Try apcms = Dir("/proc/asound/" & acard, "pcm*p").Sort(gb.Ascent)72
+' If Not Error Then73
+' For Each apcm In apcms74
+' Try apcminfos = Trim(File.Load("/proc/asound/" & acard & "/" & apcm & "/info"))75
+' If Error Then apcminfos = "name: No pcm info"76
+' For Each apcminfo In Split(apcminfos, "\n", "", True)77
+' If apcminfo Like "name: *" Then78
+' apcminfo = Trim(Split(apcminfo, ":", "", True)[1])79
+' apcmid = Replace(apcm, "pcm", "")80
+' apcmid = Trim(Replace(apcmid, "p", ""))81
+' Break82
+' Endif83
+' Next84
+' ' global.myDebug( acardid, apcmid, acardname, apcminfo)85
+' adevices.add("[plughw:" & acardid & "," & apcmid & "]" & " " & sep & " " & "(" & acardname & ":" & apcminfo & ")")86
+' Next87
+' Endif88
+' 89
+' Next90
+' Endif91
+' 92
+' Return adevices93
+' 94
+' End95
+96
+97
+'Public Sub NopParseAudioDeviceCombo_Enter()98
+ ' Dim d, ad, t, adevice As String99
+ ' Dim out As New String[]100
+ ' t = Last.text101
+ ' If NopParseAudioDeviceCombo.count < 2 Then102
+ ' Shell fmain.mplayer.executable(5) & " --audio-device=help " To ad103
+ ' For Each d In Split(ad, "\n", "", True)104
+ ' Try out.Add(Split(d, "'", "", True)[1])105
+ ' Try global.myDebug(Split(d, "'", "", True)[1])106
+ ' Next107
+ ' For Each adevice In GetAlsaDevices()108
+ ' out.Add("alsa/" & adevice)109
+ ' Next110
+ ' NopParseAudioDeviceCombo.List = out.Sort()111
+ ' 112
+ ' Last.text = t113
+ ' Endif114
+'End115
+116
+Public Sub NopParseAudioDeviceCombo_Enter()117
+ Dim t As String118
+ t = Last.text119
+ Object.Lock(Last)120
+ Last.enabled = False121
+ If NopParseAudioDeviceCombo.count < 2 Then122
+ NopParseAudioDeviceCombo.List = fmain.mplayer.audio_devices_list(" ~ ")123
+ Endif124
+ Last.text = t125
+ Object.unLock(Last)126
+ Last.enabled = True127
+End128
+129
+130
' '---------------- HACKY WORKAROUND TO STOP SCROLLVIEWS SCROLLING WHEN OBJECTS ARE FOCUSED131
' Private Scrollview_is_focused As New Collection132
' Private scrollview_scrolly As New Collection133
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
184
1
2
Indent = True3
{ CacheCheckbox CheckBox notifyobj4
Name = "CacheCheckbox"5
- MoveScaled(1,0,26,4.5714)6
+ MoveScaled(2,0,26,4.5714)7
AutoResize = True8
Text = ("Local file cache size (KB)")9
Value = CheckBox.True10
11
{ CacheSpinBox SpinBox notifyobj12
Name = "CacheSpinBox"13
MoveScaled(29,0,11,4.5714)14
+ Expand = True15
MinValue = 10016
MaxValue = 104857617
Value = 1024018
}19
+ { Label11 Label labelcheck20
+ Name = "Label11"21
+ MoveScaled(40,0,6,4.5714)22
+ AutoResize = True23
+ Text = ("KBytes")24
+ }25
}26
{ NoParse44 HBox27
MoveScaled(2,16,50,4.5714)28
29
{ CacheMinSpinboxFile SpinBox notifyobj30
Name = "CacheMinSpinboxFile"31
MoveScaled(29,0,11,4.5714)32
+ Expand = True33
MaxValue = 10000034
}35
{ Label19 Label labelcheck36
37
{ CDDACacheSpinBox SpinBox notifyobj38
Name = "CDDACacheSpinBox"39
MoveScaled(26,0,11,4.5714)40
+ Expand = True41
MinValue = 10042
MaxValue = 104857643
Value = 1024044
}45
+ { Label15 Label labelcheck46
+ Name = "Label15"47
+ MoveScaled(39,0,6,4.5714)48
+ AutoResize = True49
+ Text = ("KBytes")50
+ }51
}52
{ NoParse24 HBox53
MoveScaled(2,27,48,4.5714)54
55
{ DVDCacheSpinBox SpinBox notifyobj56
Name = "DVDCacheSpinBox"57
MoveScaled(24,1,11,4.5714)58
+ Expand = True59
MinValue = 10060
MaxValue = 104857661
Value = 102462
}63
+ { Label17 Label labelcheck64
+ Name = "Label17"65
+ MoveScaled(38,0,6,4.5714)66
+ AutoResize = True67
+ Text = ("KBytes")68
+ }69
}70
{ NoParseTitleLabel3 Panel71
MoveScaled(2,31,54,3)72
73
{ NetCacheSpinBox SpinBox notifyobj74
Name = "NetCacheSpinBox"75
MoveScaled(28,0,11,4.5714)76
+ Expand = True77
MinValue = 10078
MaxValue = 104857679
Value = 102480
}81
+ { Label18 Label labelcheck82
+ Name = "Label18"83
+ MoveScaled(41,0,6,4.5714)84
+ AutoResize = True85
+ Text = ("KBytes")86
+ }87
}88
{ NoParse32 HBox89
MoveScaled(2,38,50,4.5714)90
91
{ cacheminspinbox SpinBox notifyobj92
Name = "cacheminspinbox"93
MoveScaled(25,0,11,4.5714)94
+ Expand = True95
MaxValue = 10000096
}97
{ Label9 Label labelcheck98
Name = "Label9"99
MoveScaled(40,0,8,4.5714)100
AutoResize = True101
- Text = ("Kbytes")102
+ Text = ("KBytes")103
}104
}105
{ NoParse34 HBox106
107
{ cacheseekspinbox SpinBox notifyobj108
Name = "cacheseekspinbox"109
MoveScaled(25,1,11,4.5714)110
+ Expand = True111
MaxValue = 100000112
}113
{ Label12 Label labelcheck114
Name = "Label12"115
MoveScaled(40,1,9,4.5714)116
AutoResize = True117
- Text = ("Kbytes")118
+ Text = ("KBytes")119
}120
}121
{ NoParseTitleLabel4 Panel122
123
}124
{ dvbtCacheSpinBox SpinBox notifyobj125
Name = "dvbtCacheSpinBox"126
- MoveScaled(34,0,11,4.5714)127
+ MoveScaled(30,0,11,4.5714)128
+ Expand = True129
MinValue = 100130
MaxValue = 1048576131
Value = 10240132
}133
+ { Label20 Label labelcheck134
+ Name = "Label20"135
+ MoveScaled(43,0,6,4.5714)136
+ AutoResize = True137
+ Text = ("KBytes")138
+ }139
}140
{ NoParse39 HBox141
MoveScaled(2,54,50,4.5714)142
143
{ dvbtcacheminspinbox SpinBox notifyobj144
Name = "dvbtcacheminspinbox"145
MoveScaled(24,1,8,4.5714)146
+ Expand = True147
MaxValue = 99148
}149
{ Label16 Label labelcheck150
Name = "Label16"151
MoveScaled(33,0,14,4.5714)152
AutoResize = True153
- Text = ("Kbytes")154
+ Text = ("KBytes")155
}156
}157
}158
159
Value = CheckBox.True160
}161
}162
- { NoParse21 HBox163
- MoveScaled(1,55,50,4.5714)164
- ToolTip = ("Save xt7 position and size on program exit.")165
- Spacing = True166
- { SaveGeometryCHK CheckBox167
- MoveScaled(0,0,49,4.5714)168
- Text = ("Also save xt7 geometry on exit")169
- Value = CheckBox.True170
- }171
- }172
- { NoParse22 HBox173
- MoveScaled(1,59,50,4.5714)174
- ToolTip = ("If your window manager is not kwin\nand you find that form position is not correctly restored,\ntry checking this.")175
- Spacing = True176
- { SaveGeometryCompizCHK CheckBox177
- MoveScaled(-1,0,48,4.5714)178
- Text = ("Alternative saving method (compiz/emerald)")179
- }180
- }181
}182
Index = 11183
Text = ("User Options")184
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
10
1
2
{ Form Form3
MoveScaled(0,0,43,15)4
ToolTip = ("Press a Key\nor (some) Mouse button(s)\n")5
- Text = ("Waiting for an HotKey...")6
+ Text = ("Waiting for an HotKey") & "..."7
Icon = Picture["icon:/16/color-picker"]8
Persistent = True9
Resizable = False10
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
21
1
2
Private Function GlobalGrab() As String3
Dim xbindkeys_output As String4
Dim outputS As String[]5
- Dim hotkey As String6
+ Dim hotkey, g As String7
+ Dim x, y, w, h As Integer8
+9
+ w = Me.Font.TextWidth("_") * 5010
+ h = Me.Font.textheight("|") * 1011
+ x = Me.screenx + (Me.w Div 2) - (w Div 2)12
+ y = Me.screeny + (Me.h Div 2) - (h Div 2)13
+ g = " -g " & w & "x" & h & "+" & x & "+" & y & " " 14
+ 15
Shell "touch /tmp/xbindkeysrc" Wait16
- Shell Global.XbindkeysBIN & " -k -f /tmp/xbindkeysrc" To xbindkeys_output17
+ Shell Global.XbindkeysBIN & g & " -k -f /tmp/xbindkeysrc" To xbindkeys_output18
outputS = Split(xbindkeys_output, "\n", "", True)19
hotkey = Trim(outputS[outputS.count - 1])20
Return hotkey21
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
21
1
2
MoveScaled(0,42,59,7)3
Spacing = True4
Margin = True5
+ { VBox1 VBox6
+ MoveScaled(1,1,4,4.5714)7
+ Expand = True8
+ }9
{ Button3 Button10
MoveScaled(0,1,19,4.5714)11
AutoResize = True12
Text = ("Print grid code to console")13
}14
- { VBox1 VBox15
- MoveScaled(1,1,4,4.5714)16
- Expand = True17
- }18
{ Button2 Button19
MoveScaled(17,1,13.5714,4.5714)20
AutoResize = True21
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
201
1
2
Private Sub Init_filters_audio()3
Dim filters_audio_list As New String[]4
Dim filter As String5
- filters_audio_list = ["equalizer", "anequalizer", "earwax", "extrastereo", "scaletempo", "alimiter", "dynaudnorm", "volume"]6
+ filters_audio_list = ["equalizer", "anequalizer", "compand", "earwax", "extrastereo", "scaletempo", "alimiter", "dynaudnorm", "volume"]7
filters_audio_list.insert(["CustomAudio1", "CustomAudio2", "CustomAudio3", "lavcac3enc", "lavrresample"])8
For Each filter In filters_audio_list9
If filter = "scaletempo" Then 10
11
Next12
object.Attach(atabstrip, atabstrip.parent, atabstrip.name)13
14
+15
+16
+17
Try item_tab = aTabstrip.Tag.Find(Lower(item_name))18
19
If item_tab >= 0 Then 20
aTabstrip.index = item_tab21
- If atabstrip.caption <> "anequalizer" Then HelpBox.reparent(aTabstrip)22
+ If atabstrip.caption <> "anequalizer" Then 23
+ If atabstrip.caption <> "compand" Then 24
+ HelpBox.reparent(aTabstrip)25
+ Endif26
+ Endif27
Else28
For i = 0 To aTabstrip.count - 129
aTabstrip.index = i30
If Lower(aTabstrip.caption) = item_name Then 31
- If atabstrip.caption <> "anequalizer" Then HelpBox.reparent(aTabstrip)32
+ If atabstrip.caption <> "anequalizer" Then 33
+ If atabstrip.caption <> "compband" Then 34
+ HelpBox.reparent(aTabstrip)35
+ Endif36
+ Endif37
Goto returnlabel38
Endif39
Next40
41
Init_filters_audio()42
Init_filters_video()43
tabstrip1.index = 044
- 45
- 46
f1.value = 5047
g1.value = 048
w1.value = 10049
50
f5.value = 400051
g5.value = 052
w5.value = 100053
- 54
+ f6.value = 800055
+ g6.value = 056
+ w6.value = 100057
initdone = True58
End59
60
61
AllParams.add(["ROCHOOSE", "replaygain-album=", "yes", "no", "Volume3", ("Like replaygain-track, but using the album-gain value")])62
AllParams.add(["ROCHOOSE", "replaygain-clip=", "yes", "no", "Volume5", ("Prevent replaygain clipping by lowering the gain")])63
AllParams.add(["ROCHOOSE", "softclip=", "yes", "no", "Volume6", ("Turns on soft clipping")])64
+ AllParams.Add(["TIP", ("Put this filter at the end of the chain, but before lavrresample (if enabled)"), "Volume7", ""])65
Global.DrawGui(AllParams, "volume", aTabstrip, switchable,,,, Me)66
AllParams.Clear67
68
69
Global.DrawGui(AllParams, "extrastereo", aTabstrip, NotSwitchable,,, "lavfi", Me)70
AllParams.Clear71
72
+73
' 'alimiter lavfi74
AllParams.Add(["TITLE", "Keep input signal under a desired threshold - (ffmpeg >=3.0 only)", "alimiter0", ""])75
AllParams.add(["RANGEFLOAT", "Input gain", "0.1", "5", "64", "alimiter1", ""])76
77
AllParams.add(["RANGEFLOAT", "asc_level", "0", "1", "1", "alimiter7", ""]) 78
79
AllParams.Add(["TIP", ("This filter is a good volume normalizer"), "alimiter6", ""])80
- AllParams.Add(["TIP", ("It is best to place the volume filter after alimiter"), "alimiter7", ""])81
Global.DrawGui(AllParams, "alimiter", aTabstrip, False,,, "lavfi", Me)82
AllParams.Clear83
84
85
AllParams.Add(["TITLE", "Audio resampler: set the default audio resampler quality", "lavrresample0", ""])86
AllParams.add(["RANGE", "phase-shift=", "4", "10", "20", "lavrresample1", "Higher=slower and better quality"]) 87
AllParams.add(["ROCHOOSE", "linear=", "yes", "no", "lavrresample2", "filter linear interpolation"])88
- AllParams.Add(["TIP", ("Put this filter at the end of the chain, but before lavcac3enc"), "lavrresample3", ""])89
+ AllParams.Add(["TIP", ("Put this filter at the end of the chain, but before lavcac3enc (if enabled)"), "lavrresample3", ""])90
Global.DrawGui(AllParams, "lavrresample", aTabstrip, switchable,,, "", Me)91
92
AllParams.Clear93
94
AllParams.add(["ROCHOOSE", "Enable DC bias correction", "0 - disable", "1 - enable", "dynaudnorm7", ""])95
AllParams.add(["ROCHOOSE", "Enable alternative boundary mode", "1 - enable", "0 - disable", "dynaudnorm8", ""])96
AllParams.add(["RANGEFLOAT", "Compress factor", "0", "0", "30", "dynaudnorm9", ""]) 97
- AllParams.Add(["TIP", ("It is best to place the volume filter after dynaudnorm"), "dynaudnorm110", ""])98
Global.DrawGui(AllParams, "dynaudnorm", aTabstrip, False,,, "lavfi", Me)99
AllParams.Clear100
'or 50 11 1 5 0 0 0 0 0101
102
Dim is_lavfi As Boolean = False103
Dim subtext As String104
Dim anequalizer_string As String105
+ Dim out_anequalizer As String = ""106
Dim atabstrip_index As Integer107
-108
+ Dim autogaindB As Integer109
110
'Find the ParsedFilter Tab and activate it:111
atabstrip_index = aTabstrip.Tag.Find(ParsedFilter)112
113
out = ParseEq() 114
Return out115
Else If Parsedfilter = "anequalizer" Then116
- anequalizer_string = eqstring(False)117
- Return "\"lavfi=[anequalizer=" & eqstring(False) & "]\"" 'this way it works at start time only" 118
+ anequalizer_string = eqstring(False, ByRef autogaindB)119
+ If autogaindB > 0 Then120
+ out_anequalizer = "lavfi=[volume=-" & autogaindB & "dB],"121
+ Endif 122
+ out_anequalizer &= "\"lavfi=[anequalizer=" & anequalizer_string & "]\"" 'this way it works at start time only" 123
+ Return out_anequalizer124
+ Else If Parsedfilter = "compand" Then125
+ Return parse_compand()126
+ 127
128
Else If Parsedfilter Like "customaudio*" Then129
out = parse_audio_filter_custom(atabstrip_index)130
131
Endif132
Next133
Next134
+ 135
+ 136
+ 137
138
If (Right(tmpstring) = ":") Then139
TmpString = Left(Tmpstring, - 1)140
141
End142
143
Public Sub ApplyBTN_Click()144
+ If Not initdone Then Return145
+ If Not alreadyloaded Then Return146
OkToChangeToCustom = False147
Fmain.apply148
OkToChangeToCustom = True149
150
Me.hide151
End152
153
+154
Private aligned As Boolean = False155
Public Sub Form_Open()156
-157
If Not initdone Then 158
Try GeneralOptions.FirstLoadIfNeeded()159
Init()160
161
TextBox8pcm.text = "\"" & myDialog.Path & "\""162
End163
164
-Public Sub GetAlsaDevices() As String[]165
- Dim acard, acardid, acardname, apcm, apcminfo, apcminfos, apcmid As String166
- Dim adevices As New String[]167
- Dim apcms As New String[]168
- Dim acards As New String[]169
- Dim sep As String = Chr(126)170
- adevices.Add("plug:dmix" & " " & sep & " " & "(" & ("Default device, software mixing") & ")")171
- adevices.Add("default" & " " & sep & " " & "(" & ("Default alsa device") & ")")172
- adevices.Add("spdif" & " " & sep & " " & "(" & ("Default S/PDIF device") & ")")173
- adevices.Add("hdmi" & " " & sep & " " & "(" & ("Default hdmi device") & ")")174
- Try acards = Dir("/proc/asound/", "card*", gb.directory)175
- If Not Error Then176
- For Each acard In acards177
- Try acardname = Trim(File.Load("/proc/asound/" & acard & "/id"))178
- If Error Then acardname = "Unknown Card"179
- acardid = Replace(acard, "card", "")180
- Try apcms = Dir("/proc/asound/" & acard, "pcm*p").Sort(gb.Ascent)181
- If Not Error Then182
- For Each apcm In apcms183
- Try apcminfos = Trim(File.Load("/proc/asound/" & acard & "/" & apcm & "/info"))184
- If Error Then apcminfos = "name: No pcm info"185
- For Each apcminfo In Split(apcminfos, "\n", "", True)186
- If apcminfo Like "name: *" Then187
- apcminfo = Trim(Split(apcminfo, ":", "", True)[1])188
- apcmid = Replace(apcm, "pcm", "")189
- apcmid = Trim(Replace(apcmid, "p", ""))190
- Break191
- Endif192
- Next193
- ' global.myDebug( acardid, apcmid, acardname, apcminfo)194
- adevices.add("[plughw:" & acardid & "," & apcmid & "]" & " " & sep & " " & "(" & acardname & ":" & apcminfo & ")")195
- Next196
- Endif197
198
- Next199
- Endif200
- 201
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
201
1
2
Index = 03
Text = "tabstrip1"4
{ HelpBox Panel5
- MoveScaled(3,11,54,29)6
+ MoveScaled(1,5,54,33)7
Tag = "0"8
Arrangement = Arrange.Vertical9
{ Button_show_man ToggleButton10
11
Picture = Picture["icon:/16/tools"]12
}13
{ TabStrip_filters_audio TabStrip14
- MoveScaled(31,-1,56,47)15
+ MoveScaled(34,0,56,47)16
#Translate = False17
- Tag = "anequalizer"18
Expand = True19
Arrangement = Arrange.Fill20
Margin = True21
- Count = 222
+ Count = 323
TextFont = Font["-1"]24
Index = 025
Text = "equalizer"26
{ ScrollView1xx Panel27
- MoveScaled(0,1,64,39)28
+ MoveScaled(0,0,64,39)29
Expand = True30
Arrangement = Arrange.Horizontal31
Spacing = True32
33
Index = 134
Text = "anequalizer"35
{ AnEqualizerPanel Panel36
- MoveScaled(-3,2,88,38)37
+ MoveScaled(3,2,88,38)38
Expand = True39
Arrangement = Arrange.Vertical40
{ PictureBox1 PictureBox41
42
}43
}44
{ FrameBand5 Panel45
- MoveScaled(94,-1,21,24)46
+ MoveScaled(94,-2,21,24)47
Font = Font["-1"]48
Arrangement = Arrange.Vertical49
AutoResize = True50
51
}52
}53
}54
+ { FrameBand6 Panel55
+ MoveScaled(116,-3,21,24)56
+ Font = Font["-1"]57
+ Arrangement = Arrange.Vertical58
+ AutoResize = True59
+ Spacing = True60
+ Margin = True61
+ Border = Border.Etched62
+ { SwitchButton6 SwitchButton switchers63
+ Name = "SwitchButton6"64
+ MoveScaled(2,2,17,4)65
+ Value = True66
+ }67
+ { Panel17 Panel68
+ MoveScaled(2,7,17,4)69
+ ToolTip = ("Center Frequency")70
+ Arrangement = Arrange.Horizontal71
+ { Label31 Label72
+ MoveScaled(1,0,2,4)73
+ Text = ("F")74
+ }75
+ { f6 SpinBox EqControls76
+ Name = "f6"77
+ MoveScaled(4,0,13,4)78
+ Font = Font["-2"]79
+ Expand = True80
+ MinValue = 181
+ MaxValue = 2400082
+ Value = 1200083
+ }84
+ }85
+ { Panel18 Panel86
+ MoveScaled(2,12,17,4)87
+ ToolTip = ("Gain (dB)")88
+ Arrangement = Arrange.Horizontal89
+ { Label32 Label90
+ MoveScaled(1,0,2,4)91
+ Text = ("G")92
+ }93
+ { g6 SpinBox EqControls94
+ Name = "g6"95
+ MoveScaled(4,0,13,4)96
+ Font = Font["-2"]97
+ Expand = True98
+ MinValue = -3099
+ MaxValue = 30100
+ }101
+ }102
+ { Panel19 Panel103
+ MoveScaled(2,17,17,4)104
+ ToolTip = ("Filter width (Hz)")105
+ Arrangement = Arrange.Horizontal106
+ { Label33 Label107
+ MoveScaled(1,0,2,4)108
+ Text = ("W")109
+ }110
+ { w6 SpinBox EqControls111
+ Name = "w6"112
+ MoveScaled(4,0,13,4)113
+ Font = Font["-2"]114
+ Expand = True115
+ MinValue = 1116
+ MaxValue = 24000117
+ Value = 2000118
+ }119
+ }120
+ }121
+ }122
+ }123
+ Index = 2124
+ Text = "compand"125
+ { vboxcompand Panel126
+ MoveScaled(2,3,52,36)127
+ Arrangement = Arrange.Vertical128
+ Spacing = True129
+ Margin = True130
+ { Hbox8 HBox131
+ MoveScaled(3,2,51,6)132
+ Padding = 6133
+ { Label34 Label134
+ MoveScaled(1,0,17,5)135
+ Text = ("Makeup Gain (dB)")136
+ }137
+ { makeupgainspinbox SpinBox compand_dynaobj138
+ Name = "makeupgainspinbox"139
+ MoveScaled(34,0,16,5)140
+ Font = Font["Monospace"]141
+ Expand = True142
+ MinValue = 1143
+ MaxValue = 1000144
+ Step = 5145
+ Value = 15146
+ }147
+ }148
+ { Button_compand_autovalues ToggleButton149
+ MoveScaled(1,10,51,4)150
+ Text = ("Auto values")151
+ }152
+ { hboxsoftknee HBox153
+ MoveScaled(1,15,51,6)154
+ Padding = 6155
+ { Label35 Label156
+ MoveScaled(2,0,17,5)157
+ Text = ("Soft knee radius")158
+ }159
+ { softkneespinbox SpinBox compand_dynaobj160
+ Name = "softkneespinbox"161
+ MoveScaled(34,0,16,5)162
+ Font = Font["Monospace"]163
+ Expand = True164
+ MaxValue = 900165
+ Step = 5166
+ Value = 7167
+ }168
+ }169
+ { hboxdecay HBox170
+ MoveScaled(1,22,51,6)171
+ Padding = 6172
+ { Label36 Label173
+ MoveScaled(1,0,17,5)174
+ Text = ("Decay (decisecs)")175
+ }176
+ { DecaySpinbox SpinBox compand_dynaobj177
+ Name = "DecaySpinbox"178
+ MoveScaled(34,0,16,5)179
+ Font = Font["Monospace"]180
+ Expand = True181
+ MaxValue = 999999182
+ Step = 10183
+ Value = 150184
+ }185
}186
}187
Index = 0188
189
Tag = "alsa-mixer-device"190
Text = ("Mixer Device")191
}192
- { AlsaDeviceTextBox ComboBox193
+ { AlsaMixerDevice ComboBox194
MoveScaled(18,1,26,4.5714)195
Font = Font["Monospace"]196
Expand = True197
- Text = ("spdif")198
}199
}200
{ AlsaParseMeHbox1 HBox201
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
25
1
2
3
Try opts.Add(o("sub-auto", Split(Combofuzziness.text, " ", "", True)[0]))4
5
- If EncaComboBox.text Like "* *" Then6
- If Split(EncaComboBox.text, " ", "", True)[0] <> "xx" Then7
- opts.Add(o("sub-codepage", "enca:" & Split(EncaComboBox.text, " ")[0] & ":" & Split(ComboSubCp.text, " ", "", True)[0]))8
+ If codepage_force_combobox.value = CheckBox.True Then 9
+ opts.Add(o("sub-codepage", "+" & ComboSubCp.text))10
Else11
opts.Add(o("sub-codepage", ComboSubCp.text))12
- Endif13
Endif14
- 15
+16
If (fullpath <> "") Then17
If MkvWorkaroundCHK.value Then 'http://bugzilla.mplayerhq.hu/show_bug.cgi?id=187018
If (Lower(file.Ext((fullpath))) = "mkv") Then19
20
panelsubtitles.h = hbox1.y + hbox1.h + Desktop.scale * 221
22
End23
+24
+25
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
79
1
2
{ ComboAlignment ComboBox notifytest3
Name = "ComboAlignment"4
MoveScaled(20,1,20,4.5714)5
+ #Translate = False6
ReadOnly = True7
- List = [("2) Bottom/Center"), ("1) Bottom/Left"), ("3) Bottom/Right")]8
- Text = ("2) Bottom/Center")9
+ List = ["2) Bottom/Center", "1) Bottom/Left", "3) Bottom/Right"]10
+ Text = "2) Bottom/Center"11
}12
}13
{ PositionHBox HBox14
15
Value = 9516
}17
}18
- { Panel5 Panel19
- MoveScaled(1,23,51,5)20
- Arrangement = Arrange.Horizontal21
- AutoResize = True22
- { Label2 Label23
- MoveScaled(0,0,24,4.5714)24
- Expand = True25
- Text = ("Guess codepage for:")26
- Alignment = Align.Left27
- }28
- { EncaComboBox ComboBox29
- MoveScaled(32,0,18,4.5714)30
- Expand = True31
- ReadOnly = True32
- 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)")])33
- Text = ("iso-8859-1")34
- }35
- }36
{ Panel6 Panel37
- MoveScaled(1,28,50,5)38
+ MoveScaled(1,24,50,5)39
Arrangement = Arrange.Horizontal40
AutoResize = True41
{ Label1 Label42
- MoveScaled(0,0,24,4.5714)43
+ MoveScaled(1,0,24,4.5714)44
Expand = True45
- Text = ("If guess fails, use:")46
+ Text = ("Codepage")47
Alignment = Align.Left48
}49
{ ComboSubCp ComboBox50
MoveScaled(32,0,17,4.5714)51
+ #Translate = False52
Expand = True53
ReadOnly = True54
- 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")])55
- Text = ("iso-8859-1")56
+ 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"])57
+ Text = "auto"58
Sorted = True59
}60
}61
+ { SubDelayHbox3 HBox62
+ MoveScaled(1,29,53,5)63
+ ToolTip = ("Subtitle delay.\nmpv option: --sub-delay <sec>")64
+ AutoResize = True65
+ Spacing = True66
+ Padding = 1067
+ { codepage_force_combobox CheckBox68
+ MoveScaled(1,0,49,5)69
+ 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")70
+ Text = ("Use that codepage even if input is NOT UTF-8")71
+ }72
+ }73
{ SubDelayHbox HBox74
- MoveScaled(1,33,28,4.5714)75
+ MoveScaled(1,34,28,4.5714)76
ToolTip = ("Subtitle delay.\nmpv option: --sub-delay <sec>")77
AutoResize = True78
Spacing = True79
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
11
1
2
Try global.arg_new_instance = Args.Has("n", "new-instance", ("Play in a new instance even if one is already running"))3
Try global.arg_start_tray = Args.Has("t", "tray", ("Start minimized in the tray"))4
Try global.arg_debug = Args.Has("v", "verbose", ("Enable debug output"))5
-6
+ If global.arg_debug Then DBus.Debug = True7
+ 'DBus.Debug = True 'cercami8
9
Try global.arg_file = Args.end()[0]10
11
xt7-player-mpv-0.22.391.tar.gz/AA_ToDo -> xt7-player-mpv-0.24.392.tar.gz/AA_ToDo
Changed
25
1
2
pausa se aumentano i drop nel vo3
-xrandr, usa display-fps invece che chiamare xrandr4
-pausa, cambio speed, unpausa5
6
opzioni aggiuntive opengl?7
custom audio/custom video?8
9
- invertire l'ordine dei risultati youtube?10
- opzione "-volume" per il volume iniziale (possibile prenderla direttamente dalla barra del volume?)11
12
--crash alla seconda ripetizione dei sub con queste opzioni:13
-__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"14
15
16
17
-* opensubtitles integration?18
-* mettere lA CATEGORIA AUDIOVIDEO19
-* trovare un modo per levare i messaggi di errore di mplayertag dai log20
-* ordinare i canali quando si incolonnano nella griglia21
-22
23
Se attivi un driver video, poi non si può più disabilitare se è24
disabled il checkbox...25
xt7-player-mpv-0.24.392.tar.gz/_config.yml
Added
4
1
2
+theme: jekyll-theme-tactile3
\ No newline at end of file4
xt7-player-mpv-0.22.391.tar.gz/_mpvstats.lua -> xt7-player-mpv-0.24.392.tar.gz/_mpvstats.lua
Changed
12
1
2
{no=true, [""]=true})3
end4
append_property(s, "avsync", {prefix="A-V:"})5
- if append_property(s, "drop-frame-count", {prefix="Dropped:"}) then6
- append_property(s, "vo-drop-frame-count", {prefix="VO:", nl=""})7
+ if append_property(s, "decoder-drop-frame-count", {prefix="Dropped:"}) then8
+ append_property(s, "frame-drop-count", {prefix="VO:", nl=""})9
append_property(s, "mistimed-frame-count", {prefix="Mistimed:", nl=""})10
append_property(s, "vo-delayed-frame-count", {prefix="Delayed:", nl=""})11
end12