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 9
xt7-player-mpv.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Sat Nov 5 19:10:14 UTC 2016 - avvissu@yandex.by4
+5
+- Update to 0.21.384:6
+ * see: /usr/share/doc/packages/xt7-player-mpv/CHANGELOG_GIT7
+- Switch to Qt58
+9
+-------------------------------------------------------------------10
Mon Sep 5 12:35:09 UTC 2016 - avvissu@yandex.by11
12
- Update to 0.20.384:13
xt7-player-mpv.spec
Changed
75
1
2
3
4
Name: xt7-player-mpv5
-Version: 0.20.3846
+Version: 0.21.3847
Release: 08
Summary: Qt/Gambas gui to mpv9
License: GPL-2.0+10
11
Url: http://xt7-player.sourceforge.net/xt7forum/12
Source0: https://github.com/kokoko3k/xt7-player-mpv/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz13
BuildRequires: desktop-file-utils14
-BuildRequires: gambas3-devel >= 3.8.415
+BuildRequires: gambas3-devel >= 3.9.116
BuildRequires: gambas3-gb-args17
BuildRequires: gambas3-gb-compress18
BuildRequires: gambas3-gb-db19
20
BuildRequires: gambas3-gb-image-io21
BuildRequires: gambas3-gb-net22
BuildRequires: gambas3-gb-net-curl23
-BuildRequires: gambas3-gb-qt424
-BuildRequires: gambas3-gb-qt4-ext25
BuildRequires: gambas3-gb-settings26
BuildRequires: gambas3-gb-signal27
BuildRequires: gambas3-gb-util-web28
29
Requires: gambas3-gb-image30
Requires: gambas3-gb-net31
Requires: gambas3-gb-net-curl32
-Requires: gambas3-gb-qt433
-Requires: gambas3-gb-qt4-ext34
Requires: gambas3-gb-settings35
Requires: gambas3-gb-signal36
Requires: gambas3-gb-util-web37
Requires: gambas3-gb-web38
Requires: gambas3-gb-libxml39
Requires: gambas3-runtime >= 3.8.440
-Requires: mpv >= 0.20.041
+Requires: mpv >= 0.21.042
Requires: wget43
Requires: youtube-dl44
Recommends: dvb45
46
Recommends: xbindkeys47
Recommends: xdg-utils48
BuildArch: noarch49
+%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 12010050
+BuildRequires: gambas3-gb-qt551
+BuildRequires: gambas3-gb-qt5-ext52
+Requires: gambas3-gb-qt553
+Requires: gambas3-gb-qt5-ext54
+%else55
+BuildRequires: gambas3-gb-qt456
+BuildRequires: gambas3-gb-qt4-ext57
+Requires: gambas3-gb-qt458
+Requires: gambas3-gb-qt4-ext59
+%endif60
61
%description62
Aims to be an (in)complete graphical interface to mpv, focused on63
64
%prep65
%setup -q66
67
+# Build with Qt468
+%if 0%{?suse_version} <= 1320 && !0%{?sle_version}69
+sed -i 's/gb\.qt5/gb.qt4/' .project70
+%endif71
+72
%build73
gbc3 -e -a -g -t -p -m74
gba375
xt7-player-mpv-0.20.384.tar.gz/killer.sh
Deleted
30
1
2
-#!/bin/bash3
-4
-#echo 'when $1 dies, $2 will be killed'5
-6
-if [ -z "$1" ] ; then exit 0 ; fi7
-if [ -z "$2" ] ; then exit 0 ; fi8
-9
-xt7_pid=$110
-mpv_pid=$211
-12
-xt7_cmd=$(cat /proc/$xt7_pid/cmdline)13
-mpv_cmd=$(cat /proc/$mpv_pid/cmdline)14
-15
-#Wait while xt7 is alive:16
-while [ "$xt7_cmd" == "$(cat /proc/$xt7_pid/cmdline)" ] ; do17
- #echo xt7 pid $xt7_pid is alive18
- if [ "$mpv_cmd" != "$(cat /proc/$mpv_pid/cmdline)" ]; then19
- #echo mpv pid $mpv_pid is dead, exiting now20
- exit 021
- fi22
- sleep 1023
-done24
-25
-echo "$1" is dead26
-if [ "$mpv_cmd" == "$(cat /proc/$mpv_pid/cmdline)" ]; then27
- echo killing $mpv_pid28
- kill $mpv_pid ; sleep 1 ; kill -9 $mpv_pid29
-fi30
xt7-player-mpv-0.20.384.tar.gz/.lang/it.mo -> xt7-player-mpv-0.21.384.tar.gz/.lang/it.mo
Changed
xt7-player-mpv-0.20.384.tar.gz/.lang/it.po -> xt7-player-mpv-0.21.384.tar.gz/.lang/it.po
Changed
201
1
2
#, fuzzy3
msgid ""4
msgstr ""5
-"Project-Id-Version: xt7-player-mpv 3.8.4\n"6
-"PO-Revision-Date: 2016-07-26 14:18 UTC\n"7
+"Project-Id-Version: xt7-player-mpv 3.9.1\n"8
+"PO-Revision-Date: 2016-10-03 06:47 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:898417
+#: AddUriForm.form:51 FMain.class:902018
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:9470 GeneralOptions.form:107726
+#: AddUriForm.form:152 FMain.class:9510 GeneralOptions.form:107727
msgid "Add"28
msgstr "Aggiungi"29
30
31
msgid "Close"32
msgstr "Chiudi"33
34
-#: AlbumView.class:92 FMain.class:139635
+#: AlbumView.class:94 FMain.class:140836
msgid "Unknown"37
msgstr "Sconosciuto"38
39
-#: AlbumView.class:18440
+#: AlbumView.class:18641
msgid "more than 50 tracks!"42
msgstr "più di 50 tracce!"43
44
-#: AlbumView.class:24545
+#: AlbumView.class:24746
msgid "Unknown Year"47
msgstr "Anno sconosciuto"48
49
50
msgid "Choose quality level."51
msgstr "Scegli il livello di qualità"52
53
-#: AudioConvert.class:8854
+#: AudioConvert.class:8955
msgid "Seems a youtube link, getting real stream url and title..."56
msgstr "Sembra un collegamento a youtube, individuazione dell' indirizzo reale e del titolo in corso..."57
58
59
msgid "Title"60
msgstr "Titolo"61
62
-#: AudioConvert.class:94 FMain.class:995863
+#: AudioConvert.class:95 FMain.class:999964
msgid "Unable to get the real stream url"65
msgstr "Non posso recuperare l'url reale del flusso"66
67
-#: AudioConvert.class:12568
+#: AudioConvert.class:12669
msgid "Source:"70
msgstr "Sorgente:"71
72
-#: AudioConvert.class:12673
+#: AudioConvert.class:12774
msgid "Destination:"75
msgstr "Destinazione:"76
77
-#: AudioConvert.class:13178
+#: AudioConvert.class:13279
msgid "User stopped."80
msgstr "Fermato dall'utente."81
82
-#: AudioConvert.class:13583
+#: AudioConvert.class:13684
msgid "Skipped."85
msgstr "Saltato."86
87
-#: AudioConvert.class:14688
+#: AudioConvert.class:14789
msgid "Done."90
msgstr "Fatto."91
92
-#: AudioConvert.class:17193
+#: AudioConvert.class:17294
msgid "Updating Library/Playlist"95
msgstr "Aggiornamento della Libreria/Playlist"96
97
98
msgid "Skip current"99
msgstr "Salta al prossimo"100
101
-#: AudioConvert.form:174 DVBTuner.form:78102
+#: AudioConvert.form:174 DVBTuner.form:82103
msgid "Start"104
msgstr "Avvia"105
106
-#: AudioForm.class:12 FMain.form:691 FormLyrics.form:91 Searchfields.form:58107
+#: AudioForm.class:12 FMain.form:691 FormLyrics.form:94 Searchfields.form:58108
msgid "Artist"109
msgstr "Artista"110
111
112
msgid "Album"113
msgstr "Album"114
115
-#: AudioForm.class:14 FMain.form:2675 Searchfields.form:90116
+#: AudioForm.class:14 FMain.form:2674 Searchfields.form:90117
msgid "Year"118
msgstr "Anno"119
120
-#: AudioForm.class:16 FMain.form:2743 Searchfields.form:119121
+#: AudioForm.class:16 FMain.form:2742 Searchfields.form:119122
msgid "Comment"123
msgstr "Commento"124
125
126
msgid "Lyrics"127
msgstr "Testi"128
129
-#: AudioForm.class:24 FMain.form:2211130
+#: AudioForm.class:24 FMain.form:2210131
msgid "Radio"132
msgstr "Radio"133
134
135
msgid "Name"136
msgstr "Nome"137
138
-#: AudioForm.class:26 FMain.class:8973 Searchfields.form:104139
+#: AudioForm.class:26 FMain.class:9009 Searchfields.form:104140
msgid "Length"141
msgstr "Durata"142
143
144
msgid ":"145
msgstr "-"146
147
-#: ChooseAspect.form:53 GeneralOptions.form:2419148
+#: ChooseAspect.form:53 GeneralOptions.form:2420149
msgid "="150
msgstr "-"151
152
153
msgid "ShutDown CountDown..."154
msgstr "Conto alla rovescia per lo spegnimento."155
156
-#: CountDown.form:17 NewChains.class:473157
+#: CountDown.form:17 NewChains.class:478158
msgid "Abort"159
msgstr "Annulla"160
161
162
msgid "Try to use less strict terms, remove symbols and so on..."163
msgstr "Prova ad usare termini meno stretti, rimuovi i simboli e così via..."164
165
-#: CoverManager.class:913166
+#: CoverManager.class:941167
msgid "Load a Jpg cover image"168
msgstr "Carica una copertina in formato jpg"169
170
-#: CoverManager.class:929171
+#: CoverManager.class:957172
msgid "Error while loading the picture"173
msgstr "Errore durante il caricamento dell' immagine"174
175
-#: CoverManager.class:961 FMain.class:7893176
+#: CoverManager.class:991 FMain.class:7929177
msgid "\nso you are going to set a cover for this particular file/stream"178
msgstr "\nQuindi la copertina che imposterai sarà solo per questo file o stream"179
180
-#: CoverManager.class:962 FMain.class:7894181
+#: CoverManager.class:992 FMain.class:7930182
msgid "Artist Or Album tag information are required to set a cover"183
msgstr "Le tag artista o album sono necessarie per impostare una copertina"184
185
186
msgid "Load cover"187
msgstr "Carica da disco"188
189
-#: CoverManager.form:178 GeneralOptions.form:2803190
+#: CoverManager.form:178 GeneralOptions.form:2804191
msgid "128"192
msgstr "-"193
194
-#: CoverManager.form:178 GeneralOptions.form:2803195
+#: CoverManager.form:178 GeneralOptions.form:2804196
msgid "160"197
msgstr "-"198
199
200
msgid "Set Cover"201
xt7-player-mpv-0.20.384.tar.gz/.project -> xt7-player-mpv-0.21.384.tar.gz/.project
Changed
40
1
2
# Gambas Project File 3.03
-# Compiled with Gambas 3.8.44
+# Compiled with Gambas 3.9.15
Title=xt7-player6
Startup=StartClass7
Icon=xt7-player-mpv.png8
-Version=0.20.3849
+Version=0.21.39210
Component=gb.args11
Component=gb.image12
-Component=gb.qt413
+Component=gb.qt514
Component=gb.form15
Component=gb.compress16
Component=gb.dbus17
18
Component=gb.libxml19
Component=gb.net20
Component=gb.net.curl21
-Component=gb.qt4.ext22
+Component=gb.qt5.ext23
Component=gb.signal24
Component=gb.web25
Description="Xt7-Player, an (almost) complete mpv gui"26
Authors="Antonio Orefice <xt7player@gmail.com>"27
-Arguments="-v"28
+Arguments=[["/mnt/nas.crypt/Musica/BestOfBowie/CD1/01.Space.Oddity.ogg","-v"],["-v"]]29
+CurrentArgument=230
TabSize=231
Translate=132
Language=en33
34
Groups=ubuntu:"video"35
Tags=Multimedia,Music,Video36
Dependencies=mpv,taglib,wget,youtube-dl,37
-GambasVersion=3.838
+GambasVersion=3.939
CreateMenu=140
xt7-player-mpv-0.20.384.tar.gz/.settings -> xt7-player-mpv-0.21.384.tar.gz/.settings
Changed
201
1
2
-[Bookmarks]3
-FMain=[7697]4
-GeneralOptions=[1251]5
-6
[Breakpoints]7
-Count=28
-Breakpoint[1]="YoutubeClass.277"9
-Breakpoint[2]="YoutubeClass.283"10
+Count=011
12
[DebugWindow]13
Count=014
15
-[DebugWindow/(Dir(Directory, "*.BMP"))]16
-Geometry=[45,0,224,280]17
-18
-[DebugWindow/AC3s]19
-Geometry=[928,154,344,344]20
-21
-[DebugWindow/ACheckBox]22
-Geometry=[1280,0,299,639]23
-24
-[DebugWindow/ACheckbox]25
-Geometry=[1280,0,210,724]26
-27
-[DebugWindow/AComment]28
-Geometry=[1280,0,224,280]29
-30
-[DebugWindow/AFiltersCfg]31
-Geometry=[52,0,210,920]32
-33
-[DebugWindow/AlbumGridView]34
-Geometry=[47,0,349,788]35
-36
-[DebugWindow/AlbumGridView.Current]37
-Geometry=[51,0,508,410]38
-39
-[DebugWindow/AlbumView]40
-Geometry=[51,0,698,661]41
-42
-[DebugWindow/AllParams]43
-Geometry=[0,0,301,301]44
-45
-[DebugWindow/AllParams[1]]46
-Geometry=[0,0,301,301]47
-48
-[DebugWindow/AllowedContainers]49
-Geometry=[0,0,210,210]50
-51
-[DebugWindow/AlreadyPlayed]52
-Geometry=[0,0,344,344]53
-54
-[DebugWindow/AlreadyPlayedString]55
-Geometry=[0,0,344,344]56
+[DebugWindow/Last]57
+Geometry=[2040,310,224,280]58
59
-[DebugWindow/AnHBOX]60
+[DebugWindow/NewChains.parse_drivers(False)]61
Geometry=[1280,0,224,280]62
63
-[DebugWindow/AnHBox]64
-Geometry=[47,0,344,344]65
-66
-[DebugWindow/Application]67
-Geometry=[0,0,344,344]68
-69
-[DebugWindow/Arrange]70
-Geometry=[0,40,301,301]71
-72
-[DebugWindow/AudioChainBox.Children]73
-Geometry=[52,0,210,210]74
-75
-[DebugWindow/Audios]76
-Geometry=[899,0,373,997]77
-78
-[DebugWindow/Audiotag]79
-Geometry=[0,0,520,375]80
-81
-[DebugWindow/ChainFilter]82
-Geometry=[0,0,344,344]83
-84
-[DebugWindow/Chains]85
-Geometry=[0,0,344,344]86
-87
-[DebugWindow/Chains.controls]88
-Geometry=[0,0,301,301]89
-90
-[DebugWindow/ChangedForms]91
-Geometry=[47,-3,210,210]92
-93
-[DebugWindow/ChannelNode]94
-Geometry=[0,0,344,344]95
-96
-[DebugWindow/ChannelNode.Children[j]]97
-Geometry=[0,0,344,384]98
-99
-[DebugWindow/ChannelNode.Children[j].Attributes]100
-Geometry=[0,0,344,344]101
-102
-[DebugWindow/Channelnode.Children[j].Attributes]103
-Geometry=[0,0,344,344]104
-105
-[DebugWindow/Channelnode.Children[t].Attributes]106
-Geometry=[0,0,344,344]107
-108
-[DebugWindow/Collection]109
-Geometry=[1280,-3,224,280]110
-111
-[DebugWindow/Color]112
-Geometry=[0,0,301,301]113
-114
-[DebugWindow/Color[img.Pixels[i]]]115
-Geometry=[1280,0,210,536]116
-117
-[DebugWindow/ColumnView(FileView1.Children[1]).Columns]118
-Geometry=[726,312,564,770]119
-120
-[DebugWindow/ColumnView(FileView1.Children[1]).Item]121
-Geometry=[726,312,564,770]122
-123
-[DebugWindow/ColumnView(FileView1.Children[1]).Proxy]124
-Geometry=[604,227,564,770]125
-126
-[DebugWindow/ColumnView(fileview1.Children[1]).Item]127
-ShowHidden=True128
-Geometry=[596,244,481,686]129
-130
-[DebugWindow/Columnindex]131
-Geometry=[325,-20,210,210]132
-133
-[DebugWindow/ConfFile]134
-Geometry=[0,0,210,210]135
-136
-[DebugWindow/Container]137
-Geometry=[0,0,301,301]138
-139
-[DebugWindow/ControlPanel]140
-Geometry=[362,125,210,778]141
-142
-[DebugWindow/ControlPanel.Children]143
-Geometry=[1294,14,210,778]144
-145
-[DebugWindow/ControlPanel.Parent]146
-Geometry=[376,139,210,778]147
-148
-[DebugWindow/ControlPanelright.Children]149
-Geometry=[47,0,210,210]150
-151
-[DebugWindow/CoverCacheList]152
-Geometry=[51,587,660,344]153
-154
-[DebugWindow/CoverCacheList[cachefile]]155
-Geometry=[47,-3,210,210]156
-157
-[DebugWindow/CoverManager]158
-Geometry=[48,-4,210,210]159
-160
-[DebugWindow/CoverManager.Shadowed(thumb)]161
-Geometry=[1280,-3,210,210]162
-163
-[DebugWindow/CoverQueue]164
-Geometry=[232,119,783,782]165
-166
-[DebugWindow/CoverQueue.Pop()]167
-Geometry=[51,0,210,210]168
-169
-[DebugWindow/CurrentParams]170
-Geometry=[0,0,301,301]171
-172
-[DebugWindow/DestList]173
-Geometry=[0,41,344,344]174
-175
-[DebugWindow/DestList.Ptable]176
-Geometry=[0,0,301,301]177
-178
-[DebugWindow/DestinationObj]179
-Geometry=[51,0,301,301]180
-181
-[DebugWindow/DestinationObj.children]182
-Geometry=[1280,0,210,210]183
-184
-[DebugWindow/Dialog]185
-Geometry=[51,0,344,344]186
-187
-[DebugWindow/Dialog.filter]188
-Geometry=[0,35,344,344]189
-190
-[DebugWindow/Dir(DirToAdd).Sort()]191
-Geometry=[47,0,588,465]192
-193
-[DebugWindow/Dir(Directory, "*.MP3")]194
-Geometry=[1280,0,210,210]195
-196
-[DebugWindow/Dir(ScrollThumbsPath)]197
-Geometry=[47,0,210,210]198
-199
-[DebugWindow/Dir(ScrollThumbsPath).sort()]200
-Geometry=[47,0,210,210]201
xt7-player-mpv-0.20.384.tar.gz/.src/0_Moduli/Global.module -> xt7-player-mpv-0.21.384.tar.gz/.src/0_Moduli/Global.module
Changed
171
1
2
Public LSyncingMessage As String 3
Public AppName As String 4
Public ConfPath As String 5
+Public TmpDir As String6
Public CustomBindKeys As String 7
Public XbindkeysBIN As String 8
Public SocketFile As String 9
10
Public arg_debug As Boolean = False 11
Public arg_new_instance As Boolean = False 12
Public arg_start_tray As Boolean = False13
+Public mpv_version As String = ""14
+15
16
Public Sub init()17
'FixFormNames() 'needed with gambas 3.4.1; form names arent set by default!18
19
'Please terminate ALLFILTERS with ";"!20
'ALLFilters '= Videofilter & ";" & AudioFilter & ";" & UncommonVideoFilters & ";" & UncommonAudiofilters21
quotes = "\"" 'double quotes in strings22
- aboutmessage = "\n" & "xt7-Player-mpv" & " " & Application.version & (" by Antonio Orefice.\nxt7player@gmail.com\n\nThanks to Benoît Minisini for Gambas.") & "\n\n" & "I92guboj - Spanish translation \n" & "Wackenroader - Brazilian Portuguese translation \n" & "Shimingzhou - simplified Chinese translation\n" & "Jacky Bamière - French translation\n" & "VictorR2007 - Russian Translation\n" & "SymbianFlo - Testing and 'spiritual' support\n" & "NickiNicki - Bug reports\n" & "Eloaders and all the contributors\nat https://launchpad.net/xt7-player \n" 23
+ aboutmessage = "\n" & "xt7-Player-mpv" & " " & Application.version & (" by Antonio Orefice.\nxt7player@gmail.com\n\nThanks to Benoît Minisini for Gambas.") & "\n\n" & "I92guboj - Spanish translation \n" & "Wackenroader - Brazilian Portuguese translation \n" & "Shimingzhou - simplified Chinese translation\n" & "Jacky Bamière - French translation\n" & "VictorR2007 - Russian Translation\n" & "SymbianFlo - Testing and 'spiritual' support\n" & "NickiNicki - Bug reports\n" 24
+ aboutmessage &= "'Argon-' for the nice lua stats script\n " 25
Alternatecolor = &EEEEFF&26
LSyncing = False 'is true when library is syncing.27
LSyncingMessage = ("Syncing Library, please wait...")28
29
SettingsFileName = "default"30
MaxHistory = 1531
DelayLoadStates = New Timer As "DelayLoadStates"32
+ TmpDir = File.Dir(Temp())33
End34
35
36
37
If l Like "*=*" Then 38
opt = Left(l, InStr(l, "=") - 1)39
data = Right(l, Len(l) - Len(opt) - 1)40
+ If data = "" Then data = Chr(8)41
out[opt] = data42
Else43
out[l] = Chr(8)44
45
Return out46
End47
48
+49
+Public Struct MpvOption50
+ name As String51
+ data As String52
+End Struct53
+54
Public Sub save_cached_options(ProfileName As String)55
'save mpv options in a profile format compatible with mpv56
Dim cached_file_name As String = global.confpath & "/" & Profilename & ".cached"57
Dim cached_data, data As String58
+ Dim driver_opts As MpvOption[]59
+ Dim opt As MpvOption60
61
If Not Exist(global.confpath, True) Then 62
global.myDebug("Configuration directory not found; something is going VERY wrong.")63
Return64
Endif65
66
- ' opts = fmain.user_options()67
- ' For Each data In opts68
- ' If data <> Chr(8) Then69
- ' cached_data &= opts.key & "=" & data & "\n"70
- ' Else71
- ' cached_data &= opts.key & "\n"72
- ' Endif73
- ' Next74
- ' cached_data &= "volume=" & fmain.Initialvolume() & "\n"75
-76
NewChains.FirstLoadIfNeeded()77
78
- data = NewChains.parse_drivers(False)79
- If data <> "" Then cached_data &= "vo=" & data & "\n"80
- 81
- data = NewChains.parse_drivers(True)82
- If data <> "" Then cached_data &= "ao=" & data & "\n"83
+ driver_opts = NewChains.parse_drivers(False)84
+85
+ If driver_opts <> Null Then86
+ For Each opt In driver_opts87
+ cached_data &= opt.name & "=" & opt.data & "\n"88
+ Next89
+ driver_opts.Clear90
+ Endif91
+92
+ driver_opts = NewChains.parse_drivers(True)93
+ If driver_opts <> Null Then94
+ For Each opt In driver_opts95
+ cached_data &= opt.name & "=" & opt.data & "\n"96
+ Next97
+ Endif98
99
data = NewChains.parse_filters(False)100
If data <> "" Then cached_data &= "vf-add=" & data & "\n"101
-102
data = NewChains.parse_filters(True)103
If data <> "" Then cached_data &= "af-add=" & data & "\n"104
-105
File.Save(cached_file_name, cached_data)106
End107
108
109
If Error Then global.myDebug("Error while doing pTask.Stop()")110
End111
112
+Public Function Dedupe(sDir As String) As Boolean113
+ Dim sFiles As String114
+ Dim files As New String[]115
+ Dim i, j As Integer116
+ Dim equal As String117
+ 118
+ 'find files that are not links and sort them by size.119
+ Shell "find " & sDir & " -type f -print0 | xargs -0 du -b | sort -rn|cut -d '/' -f 2-|awk '{print \"/\" $0}'" To sFiles120
+ files = Split(sFiles, "\n", "", True)121
+ i = 0122
+ j = 0123
+ While i < files.max124
+ Repeat125
+ Inc j126
+ If j > files.max Then Return127
+ equal = EqualFiles(files[i], files[j])128
+ If equal = "True" Then129
+ Kill files[j]130
+ Link files[i] To files[j]131
+ Endif132
+ Until equal = "DIFSIZE"133
+ i = j134
+ Wend135
+ 136
+End137
+138
+Public Function EqualFiles(snew As String, sold As String) As String139
+ Dim file1, file2 As Stream140
+ Dim s1, s2 As String 141
+ Dim res As String = "True"142
+ Dim blocksize As Integer = 2048143
+ Dim size1, size2 As Integer144
+ 145
+ size1 = Stat(snew).size 146
+ size2 = Stat(sold).Size147
+ 148
+ If size1 <> size2 Then Return "DIFSIZE"149
+ 150
+ If size1 < blocksize Then blocksize = size1151
+ 152
+ If res = "True" Then 153
+ file1 = Open snew For Read154
+ file2 = Open sold For Read155
+ Do156
+ Read #file1, s1, - blocksize157
+ Read #file2, s2, - blocksize158
+ If s1 <> s2 Then159
+ res = "False"160
+ Break161
+ Endif162
+ If Len(s1) <> 2048 Then Break 163
+ Loop164
+ 165
+ Close #file1166
+ Close #file2167
+ Endif168
+ 169
+ Return res170
+End171
xt7-player-mpv-0.20.384.tar.gz/.src/0_Moduli/HotKeysHelper.module -> xt7-player-mpv-0.21.384.tar.gz/.src/0_Moduli/HotKeysHelper.module
Changed
10
1
2
End3
4
Private Sub StoreHotKey() 5
- Dim keycode As Integer6
+7
Dim keytext As String8
Dim out As String9
10
xt7-player-mpv-0.20.384.tar.gz/.src/0_Moduli/MyDialog.class -> xt7-player-mpv-0.21.384.tar.gz/.src/0_Moduli/MyDialog.class
Changed
11
1
2
3
Private Sub should_use_kdialog() As Boolean4
Dim kdialog As String5
+ 6
+ Return False7
+ 8
If Application.Env["XDG_CURRENT_DESKTOP"] = "KDE" Or Lower(Application.Env["DESKTOP_SESSION"]) = "KDE" Then9
If Application.Env["KDE_SESSION_VERSION"] = "4" And Application.Env["KDE_FULL_SESSION"] = "true" Then10
Shell "which kdialog" To kdialog11
xt7-player-mpv-0.20.384.tar.gz/.src/Classi/AlbumView.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Classi/AlbumView.class
Changed
24
1
2
Dim i As Integer3
Dim Startpos, MidPos, EndPos As Integer4
Dim MyValue As String5
+6
For i = 0 To localtable.count - 17
StartPos = InStr(localtable[i], ts & Field)8
MidPos = InStr(localtable[i], ts, StartPos + 1)9
EndPos = InStr(localtable[i], ts, Midpos + 1)10
MyValue = Mid(localtable[i], Startpos, Endpos - startpos)11
- Replace(localtable[i], MyValue, "")12
+ localtable[i] = Replace(localtable[i], MyValue, "")13
localtable[i] = MyValue & localtable[i]14
Next 'i15
16
17
18
'remove duplicates album19
DoSortTable("Album")20
+ 21
i = localtable.count - 122
If localtable.count > 1 Then23
Repeat 'remove duplicate albums24
xt7-player-mpv-0.20.384.tar.gz/.src/Classi/FloatSpinBox.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Classi/FloatSpinBox.class
Changed
11
1
2
3
4
Public Sub _NEW()5
- Dim hpic_up As Picture6
- Dim coordinate As Integer[]7
-8
9
Super.Border = Border.None10
MyValueBox = New ValueBox(Me) As "MyValueBox"11
xt7-player-mpv-0.20.384.tar.gz/.src/Classi/MplayerClass.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Classi/MplayerClass.class
Changed
201
1
2
3
Private Const play_initialized_str As String = "MPV_PLAY_IS_FULLY_INITIALIZED"4
5
-6
Private stopping As Boolean = False7
-8
Public pausing As Boolean = False9
Public return_value As Integer = 0 'playerprocess return value10
11
' Private Takingscreenshot As Boolean = False12
'Private lastscreenshot As String = ""13
Public last_media As String = ""14
-15
Public commandline As String = ""16
-17
Private InputPipe As String = ""18
-19
Public user_stopped As Boolean = False20
-21
Public volumeproperty As String = "volume"22
+Public Precommand As String = ""23
+Public Postcommand As String = ""24
+Public CurrentOptions As String = ""25
+Public AVcodecs As String = ""26
+Public AudioLanguages As String = "\"\""27
+Public SubLanguages As String = "\"\""28
+Public Subfile As String = ""29
+Public Quick As Boolean = False 'Skip mediainfo code30
+Public osdlevel As String = ""31
+Public lua_scripts As New String[]32
+33
+Public Function version(Optional full_line As Boolean = False) As String34
+ Dim out As String35
+ Shell executable() & " --version" To out36
+ If full_line Then Return out37
+ out = Split(out, " ", "", True)[1]38
+ Return out39
+End40
+41
+42
43
Public Function executable(Optional timeout As Integer = -1) As String44
Dim out As String45
46
Return out47
End48
49
-Public Precommand As String = ""50
-Public Postcommand As String = ""51
-52
-Public CurrentOptions As String = ""53
-54
-Public AVcodecs As String = ""55
-56
-Public AudioLanguages As String = "\"\""57
-Public SubLanguages As String = "\"\""58
-Public Subfile As String = ""59
-Public Quick As Boolean = False 'Skip mediainfo code60
-61
62
63
Private Sub ClearMediaProperties()64
65
prop["cddbtracks"] = New String[] 66
End67
68
+Public Struct MpvOptionInfo 69
+ name As String70
+ type As String71
+ default_value As Variant72
+ min As Variant73
+ max As Variant74
+ choices As String[]75
+End Struct76
77
-'Realtime Media variables78
-79
-80
-Public osdlevel As String = ""81
-82
+Public MpvOptionsInfo As New Collection[]83
84
85
Public Function FillMultitracks(Optional force_audio_only As Boolean = False)86
87
Dim out As String88
Exec ["sh", "-c", "ffmpeg -filters | grep ladspa"] To out89
Return Trim(out) <> ""90
+ 91
End92
93
94
95
Return 096
End97
98
-99
Public mpvoptions As New Collection100
101
+102
+103
+104
Public Sub set_option(name As String, data As String, Optional allow_dupes As Boolean = True)105
'chr(8) is used instead of null because the collection doesn't keep null values106
If allow_dupes Then107
108
Print109
unset_option("audio-channels", return_opts)110
Endif111
- Else If return_opts.Key = "vo" Then112
- If data Like "*opengl:*interpolation*" Then113
+ Else If return_opts.Key = "interpolation" Then114
+ If data = "yes" Then115
Print "It seems that user requested opengl temporal interpolation; setting --video-sync=display-vdrop" 116
set_option("video-sync", "display-vdrop")117
Endif118
Endif119
Next120
If volumeproperty = "ao-volume" Then121
- Print "Not using internal mpv audio mixer means disabling maximum amplification,"122
- Print "...not going To set initial volume as an option, but use a property instead"123
+ global.mydebug("Not using internal mpv audio mixer means disabling maximum amplification,\n... Not going To set initial volume As An option, but Use a Property instead")124
unset_option("volume-max", return_opts)125
unset_option("volume", return_opts)126
Endif127
128
129
Event seeking()130
131
+' Private Function lua_list() As String132
+' Dim lua_script As String133
+' Dim out_list As String134
+' For Each lua_script In lua_scripts135
+' out_list &= lua_script & ","136
+' Next137
+' out_list &= killer_script_filename()138
+' Return out_list139
+' End140
+141
142
Private Function internal_options() As Collection143
Dim out As New Collection144
145
- 'Returns a collection Of options that will be set every Time, depsite any configuration option146
-147
+ 'Returstop148
'out["quiet"] = "yes"149
out["input-file"] = SetUpInputPipe()150
out["msg-color"] = "no"151
152
out["input-default-bindings"] = "no"153
out["term-status-msg"] = play_initialized_str154
out["force-seekable"] = "yes" 'this will allow seeks within the cache155
+ out["script"] = killer_script_filename()156
+ 'out["script"] = lua_list() 'killer_script_filename()157
158
'this array will be needed by do_apply().159
'because it decides if a restart is needed by comparing the changed user options160
'with the previous one. But since changed options are set from the outside,161
'which has no clue about those internal_options, we say to do_apply to ignore162
'the following:163
- ignore_opts = ["input-file", "term-status-msg", "msg-color", "msg-level", "input-default-bindings", "start", "force-seekable", volumeproperty]164
+ ignore_opts = ["script", "input-file", "term-status-msg", "msg-color", "msg-level", "input-default-bindings", "start", "force-seekable", volumeproperty]165
Return out166
End167
168
+Public Function killer_script_filename() As String169
+ 170
+ Dim tempdir As String = global.tmpdir171
+ Dim file_name, txt_data As String172
+ 'uses a lua script to link mpv to the gui so that when the gui dies, mpv will quit173
+ txt_data = File.Load("_lua_killer.lua")174
+ txt_data = Replace(txt_data, "###", CStr(Application.id))175
+ file_name = tempdir & "/killer.lua"176
+ File.Save(file_name, txt_data)177
+ 178
+ Return file_name179
+End180
181
182
183
184
Public Function do_play(filename As String, Optional string_options As String = "", Optional restart As Boolean = False, Optional bugid1870 As Boolean = False, Optional cookieopts As String = "", Optional dumpfile As String = "/tmp/stream.dump.xt7.mpeg", Optional doanalyze As Boolean = False) As Boolean185
- Dim killer_script As String = Temp()186
+ 'Dim killer_script As String = Temp()187
Dim data As String188
Dim internal_opts As New Collection189
return_value = 0190
191
Endif192
193
mpvoptions = fix_options(mpvoptions)194
+ 195
commandline = executable() & set_options() & string_options196
+ 197
commandline &= Shell(filename)198
global.myDebug(commandline, commandline)199
last_media = filename200
201
xt7-player-mpv-0.20.384.tar.gz/.src/Classi/PlaylistClass.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Classi/PlaylistClass.class
Changed
42
1
2
Endif3
End4
5
+6
Public Sub LoadTable(ByRef table As String[], filename As String, mygrid As Gridview)7
Dim i As Integer8
Dim Layout As String[]9
10
Dim i, r As Integer11
Dim layout As String = "Layout"12
Dim MyFile As File13
- Try Copy filename To filename & ".bak"14
+15
+ 'backup grid16
+ If Not Exist(filename & ".bak", True) Then 17
+ Try Copy filename To filename & ".bak"18
+ Endif19
+ 20
+ If Exist(filename & ".bak", True) Then21
+ If Exist(filename, True) Then22
+ If Stat(filename).size > Stat(filename & ".bak").size Then23
+ Try Kill filename & ".bak"24
+ Try Copy filename To filename & ".bak"25
+ Endif26
+ Endif27
+ Endif28
+ 29
+ 30
Myfile = Open filename For Write Create31
'write table layout32
For i = 0 To mygrid.Columns.Count - 133
34
Next 'c35
Close #MyFile36
37
+ 38
+ 39
End40
41
42
xt7-player-mpv-0.20.384.tar.gz/.src/Classi/YoutubeClass.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Classi/YoutubeClass.class
Changed
10
1
2
Dim needsdecoding As Boolean = True3
' global.myDebug(url)4
url = Lower(url)5
- needsdecoding = needsdecoding And ((url Like "http://*.youtube.*/*") Or (url Like "https://*.youtube.*/*") Or (url Like "http://*.googlevideo.*/*") Or (url Like "https://*.googlevideo.*/*"))6
+ needsdecoding = needsdecoding And ((url Like "http://*.youtube.*/*") Or (url Like "ytdl://*") Or (url Like "https://*.youtube.*/*") Or (url Like "http://*.googlevideo.*/*") Or (url Like "https://*.googlevideo.*/*"))7
needsdecoding = needsdecoding And (Not (url Like "*t=*"))8
needsdecoding = needsdecoding And (Not (url Like "*ip=*"))9
needsdecoding = needsdecoding And (Not (url Like "*fexp=*"))10
xt7-player-mpv-0.20.384.tar.gz/.src/Form/AudioConvert.form -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/AudioConvert.form
Changed
17
1
2
}3
{ ProgressBar2 ProgressBar4
MoveScaled(22,0,57,3)5
+ Background = Color.TextBackground6
Expand = True7
}8
}9
10
}11
{ ProgressBar1 ProgressBar12
MoveScaled(22,0,57,3)13
+ Background = Color.TextBackground14
Expand = True15
}16
}17
xt7-player-mpv-0.20.384.tar.gz/.src/Form/AudioForm.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/AudioForm.class
Changed
103
1
2
3
4
Public Sub init()5
+ Dim micimg As Image6
7
GridUp.columns.count = 28
GridUp.rows.count = 69
10
GridUp[3, 0].text = ("Title")11
GridUp[4, 0].text = ("Comment")12
GridUp[5, 0].text = ("Lyrics")13
- GridUp[5, 1].picture = Picture["icon:/22/microphone"]14
+ 'GridUp[5, 1].picture = Picture["icon:/22/microphone"]15
+ micimg = Image.Load("audio-input-microphone.png")16
+ micimg = micimg.Stretch((gridup.Rows.h * 0.7) / (micimg.h / micimg.w), (GridUp.Rows.H * 0.7))17
+ GridUp[5, 1].picture = micimg.picture18
+19
GridUp.Columns[0].w = -120
GridUp.Columns[1].w = -121
22
23
PictureBox2_MouseDown()24
End25
26
+Public Sub AudioAreaGroup_Arrange()27
+Dim w As Integer = Last.w28
+29
+' If Last = hbox1 Then30
+ picturebox1.h = CInt(audiopanel.h / 3.15)31
+ panelvisspacer.h = gridupbox.y Div 232
+' Debug panelvisspacer.h 33
+' Endif34
+35
+ If Last = audiopanel Then36
+ If GridDown[0, 1].text = "" Then 37
+ GridDown.Rows[0].h = 038
+ Else39
+ GridDown.Rows[0].h = Griddown.Rows.H40
+ Endif41
+ 42
+ pictureback.lower43
+ If Left(GeneralOptions.NoParseVisType2.text) = 0 Then 44
+ picturebox1.Background = Color.Transparent45
+ pictureback.Move(0, 0, audiopanel.w, AudioPanel.h)46
+ Else47
+ picturebox1.Background = Color.black48
+ pictureback.Move(0, 0, audiopanel.w, AudioPanel.h - picturebox1.h)49
+ Endif50
+ Return51
+ Endif52
+ 53
+ If Last = gridup Then 54
+ MakeGridShadow(audioform.gridupShadow, GridUp)55
+ Return56
+ Endif57
+ If Last = griddown Then 58
+ MakeGridShadow(audioform.griddownShadow, GridDown)59
+ Return60
+ Endif61
+ 62
63
+End64
65
66
-Public Sub AudioAreaGroup_Arrange()67
+Public Sub OLD_AudioAreaGroup_Arrange()68
Dim w As Integer = Last.w69
If Last = audiopanel Then70
If GridDown[0, 1].text = "" Then 71
72
Endif73
74
75
-76
End77
78
-Private Sub antiglitch(color_mean As Integer)79
- FMain.outerbox.background = Color_mean80
- audiopanel.background = Color_mean81
- pictureback.Background = color_mean82
-End83
+' Private Sub antiglitch(color_mean As Integer)84
+' FMain.outerbox.background = Color_mean85
+' audiopanel.background = Color_mean86
+' pictureback.Background = color_mean87
+' End88
89
90
'Public Color_mean As Integer91
92
93
'compose the alpha mask gradient over the blurred image 94
blurred.PaintImage(gradient, 0, 0)95
+ 'blurred.PaintImage(gradient, 0, 0)96
+97
98
- antiglitch(Color.SetAlpha(blurred.Stretch(1, 3)[0, 1], 0)) 'will be used to draw the background so that glitches will be less visible.99
+ 'antiglitch(Color.SetAlpha(blurred.Stretch(1, 3)[0, 1], 0)) 'will be used to draw the background so that glitches will be less visible.100
101
pictureback.picture = blurred.picture102
pictureback.show103
xt7-player-mpv-0.20.384.tar.gz/.src/Form/AudioForm.form -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/AudioForm.form
Changed
119
1
2
Arrangement = Arrange.Fill3
{ AudioPanel VBox audioareagroup4
Name = "AudioPanel"5
- Move(7,28,672,420)6
+ Move(7,28,672,469)7
Background = &H000000&8
Tracking = True9
Expand = True10
11
Tracking = True12
Expand = True13
}14
- { Label1 Label VideoAreaGroup15
- Name = "Label1"16
- Move(28,28,161,28)17
- Visible = False18
- Font = Font["Bold,Italic,17"]19
- Foreground = &HFFFF00&20
- Text = ("Media Info ")21
- }22
{ GridUpBox HBox audioareagroup23
Name = "GridUpBox"24
Move(21,63,651,119)25
26
Alignment = Align.Center27
}28
}29
- { TimerZoomOut #Timer30
- #Move(140,63)31
- Delay = 3032
- }33
{ GridUp GridView audioareagroup34
Name = "GridUp"35
Move(189,14,364,133)36
37
ScrollBar = Scroll.None38
AutoResize = False39
}40
+ { TimerZoomOut #Timer41
+ #Move(140,63)42
+ Delay = 3043
+ }44
}45
- { Panel1 Panel audioareagroup46
- Name = "Panel1"47
- Move(28,196,588,150)48
- Arrangement = Arrange.Horizontal49
+ { Panel2 Panel audioareagroup50
+ Name = "Panel2"51
+ Move(42,203,469,182)52
+ Arrangement = Arrange.Vertical53
AutoResize = True54
- Spacing = True55
- { LeftAlignDown VBox audioareagroup56
- Name = "LeftAlignDown"57
- Move(0,0,14,77)58
- Tracking = True59
- }60
- { GridDownShadow GridView61
- Move(42,-7,504,56)62
- Background = &HFF000000&63
- Border = False64
- Grid = False65
- ScrollBar = Scroll.None66
- AutoResize = False67
+ { Panel1 Panel audioareagroup68
+ Name = "Panel1"69
+ Move(49,28,301,91)70
+ Arrangement = Arrange.Horizontal71
+ AutoResize = True72
+ Spacing = True73
+ { LeftAlignDown VBox audioareagroup74
+ Name = "LeftAlignDown"75
+ Move(49,0,14,77)76
+ Tracking = True77
+ }78
+ { GridDownShadow GridView79
+ Move(0,-7,504,56)80
+ Background = &HFF000000&81
+ Border = False82
+ Grid = False83
+ ScrollBar = Scroll.None84
+ AutoResize = False85
+ }86
+ { GridDown GridView audioareagroup87
+ Name = "GridDown"88
+ Move(70,0,420,49)89
+ Background = &HFF000000&90
+ Border = False91
+ Grid = False92
+ ScrollBar = Scroll.None93
+ AutoResize = False94
+ }95
}96
- { GridDown GridView audioareagroup97
- Name = "GridDown"98
- Move(133,14,504,50)99
- Background = &HFF000000&100
- Border = False101
- Grid = False102
- ScrollBar = Scroll.None103
- AutoResize = False104
+ { panelvisspacer Panel audioareagroup105
+ Name = "panelvisspacer"106
+ Move(98,133,252,35)107
}108
}109
{ PictureBox1 Panel audioareagroup110
Name = "PictureBox1"111
- Move(133,357,420,63)112
+ Move(119,434,420,35)113
Background = Color.Black114
Tracking = True115
- Expand = True116
}117
{ PictureBack PictureBox AudioAreaGroup118
Name = "PictureBack"119
xt7-player-mpv-0.20.384.tar.gz/.src/Form/CoverManager.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/CoverManager.class
Changed
201
1
2
3
Public Sub RemoveCoverCache(coverfile As String, Optional RemoveSourceToo As Boolean)4
Dim cachefile As String = coverfile & "_thumbcache" 'ricava il nome dei file cache5
-6
- Shell "rm '" & cachefile & "'" & "*.*" 'rimuovilo dal disco7
+ Dim linked, toremove, pointed As String8
'cercalo in memoria e rimuovilo:9
If CoverCacheList.Count > 0 Then 10
CoverCacheList.Movefirst11
12
Endif13
Until CoverCacheList.MoveBelow()14
Endif15
+16
+17
+ 'since we use soft links to save disk space, we need to be careful18
+ 'on deleting files that may be linked from other items.19
+ 'so, if what we're removing is not a link, make sure they don't loose the picture too.20
+ If Exist(coverfile, False) Then21
+ If Stat(coverfile, False).type = gb.Link Then22
+ Try Kill coverfile23
+ Else 'not a link24
+ For Each linked In Dir(global.confpath & "/covers/", "*.*", gb.link)25
+ linked = global.confpath & "/covers/" & linked26
+ Try pointed = Stat(linked).link27
+ If Error Then Continue28
+ If (pointed = coverfile) And RemoveSourceToo Then29
+ 'replace all linked files that points to the coverfile with the real coverfile30
+ Try unlink_by_copy(linked, coverfile)31
+ Else If pointed Like "*" & cachefile & "*" Then32
+ 'replace all linked thumbcaches files that points to the thumbcache coverfile33
+ Try unlink_by_copy(linked, pointed)34
+ Endif35
+ Next36
+ Endif37
+ Endif38
+39
If RemoveSourceToo Then Try Kill coverfile40
+41
+ 'clear file thumbcaches42
+ Shell "rm '" & cachefile & "'" & "*.*" & " &>/dev/null" 'rimuovilo dal disco43
+44
FMain.RefreshVisibleCovers(FMain.librarygrid)45
FMain.RefreshVisibleCovers(FMain.playlistgrid)46
End47
48
+Public Sub unlink_by_copy(linked_file As String, Optional real_file As String = "")49
+ If real_file = "" Then50
+ Try real_file = Stat(linked_file).Link51
+ If Not Exist(real_file) Then52
+ global.myDebug("Unable to unlink by copy" & linked_file, "pointed file does not exist!")53
+ Endif54
+ Endif55
+ Try Kill linked_file56
+ If Not Error Then57
+ Try Copy real_file To linked_file58
+ If Error Then global.myDebug("Unable to unlink " & linked_file, "error while copying")59
+ Endif60
+End61
62
63
64
65
Dim width As Integer66
Dim neww As Integer67
68
- 69
-' zzzfake.Arrangement = Arrange.Fill70
-' Try CoverCacheList.expand = True71
-' Try zzzfake.Stacking = Window.above72
-' Try zzzfake.mask = False73
-' Try zzzfake.opacity = 10074
-' Try zzzfake.Move(0, 0)75
-' Try zzzfake.show76
-77
-'Wait '0.000178
-79
- 'neww = generaloptions.IconWidthCombobox.text + shadowoffsetpaint 80
neww = height + (height Div 8)81
- 'Return cornice(imgandshadow, neww, neww).Picture82
-83
-'ResizeShadowTemplate(neww * 2)84
85
'gestisce le thumbnails su disco e la loro cache in memoria86
'non crea di per sè alcuna immagine, al più restituisce delle immagini di default87
88
Endif89
Endif90
Else ' IF NOT Exist(coverfile) THEN 'se la cover non esiste, ricava un nuovo coverfile:91
-92
If global.isytdl(uripath) Then93
coverfile = "ytdl.png"94
defaultcover = True95
96
Dim newfilename As String97
Dim currentfilename As String98
Dim ScaleTo As Integer99
+ Stop100
CoverManager.close101
'stop any previous search102
HitCancel = True103
'set new cover104
newfilename = Coverfile(ArtistText.text, AlbumText.text)105
106
+ Try RemoveCoverCache(newfilename, False)107
Try currentfilename = Coverlist.Current.key108
If Not Error Then109
Try Kill newfilename110
111
SaveScaled(currentfilename, newfilename, ScaleTo)112
Endif113
Endif114
- Try RemoveCoverCache(newfilename, False)115
FMain.CoverRefresh()116
117
+118
+ Try RemoveCoverCache(newfilename, False)119
Wait 0.05120
Try currentfilename = Coverlist.Current.key121
If Not Error Then122
Try Kill newfilename123
Try Copy currentfilename To ((newfilename))124
Endif125
- Try RemoveCoverCache(newfilename, False)126
FMain.CoverRefresh(True)127
+ 128
+129
End130
131
132
133
Message.Error(("Error while loading the picture"), "Ok")134
Endif135
Picturebox1.refresh136
- FMain.CoverRefresh()137
Try RemoveCoverCache(newfilename, False)138
+139
+ FMain.CoverRefresh()140
+141
End142
143
Public Sub Form_KeyPress()144
145
global.myDebug("Missing file! " & fullpath)146
FileNotFoundAdd(fullpath)147
'mygrid[row, 0].picture = picture["icon:/" & (rowheight -global.rowpadding) & "/error"]148
- mygrid[row, column].text = ""149
- mygrid[row, column].clear150
+ Try mygrid[row, column].text = ""151
+ If Not Error Then152
+ mygrid[row, column].clear153
+ Else154
+ Global.myDebug("Unexpected empty row") 155
+ Endif156
Return157
Endif158
Endif159
160
Endif161
End162
163
+164
+Private folderpictures As New Collection165
+166
Public Function FolderPicture(Directory As String) As String 167
Dim Files As New String[]168
+ Dim Matches As New String[] 169
+ Dim sMatch As String170
+ Dim sfile As String171
Dim afile As String172
- 173
- Files = (Dir(Directory, "*ront*.jpg"))174
- If Files.count > 0 Then Goto FILEFOUND 175
-176
- Files = (Dir(Directory, "*FRONT*.jpg")) 177
- If Files.count > 0 Then Goto FILEFOUND 178
-179
- Files = (Dir(Directory, "*FRONT*.JPG"))180
- If Files.count > 0 Then Goto FILEFOUND 181
182
- Files.Insert(Dir(Directory, "ront*.JPEG"))183
- If Files.count > 0 Then Goto FILEFOUND184
- 185
- Files.Insert(Dir(Directory, "*ront*.PNG"))186
- If Files.count > 0 Then Goto FILEFOUND187
- 188
- Files.Insert(Dir(Directory, "*ront*.BMP"))189
- If Files.count > 0 Then Goto FILEFOUND190
- 191
- Files.Insert(Dir(Directory, "*.jpg"))192
- If Files.count > 0 Then Goto FILEFOUND193
- 194
- Files.Insert(Dir(Directory, "*.JPG"))195
- If Files.count > 0 Then Goto FILEFOUND196
-197
- Files.Insert(Dir(Directory, "*.jpeg"))198
- If Files.count > 0 Then Goto FILEFOUND199
- 200
- Files.Insert(Dir(Directory, "*.JPEG"))201
xt7-player-mpv-0.20.384.tar.gz/.src/Form/DVBTuner.form -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/DVBTuner.form
Changed
103
1
2
Margin = True3
{ HBox2 HBox4
MoveScaled(1,3,81,4.5714)5
+ Spacing = True6
{ LabelFrequencies Label7
MoveScaled(0,1,17,3)8
AutoResize = True9
10
Padding = 211
{ LabelCardN Label12
MoveScaled(0,0,17,3)13
+ AutoResize = True14
Text = ("Card #")15
}16
{ SpinBox1 SpinBox17
18
Picture = Picture["icon:/16/cancel"]19
}20
}21
+ { Separator3 Separator22
+ MoveScaled(6,14,66,1)23
+ }24
{ Panel1 Panel25
- MoveScaled(2,13,78,8)26
+ MoveScaled(2,15,78,8)27
Background = Color.TextBackground28
Expand = True29
Arrangement = Arrange.Fill30
- Border = Border.Plain31
+ Border = Border.Sunken32
{ channelsgrid GridView33
- MoveScaled(9,1,42,5)34
+ MoveScaled(5,1,42,5)35
Expand = True36
+ Border = False37
Mode = Select.Multiple38
Grid = False39
}40
}41
{ SelectBox HBox42
- MoveScaled(0,22,82,4.5714)43
+ MoveScaled(0,24,82,4.5714)44
Spacing = True45
Padding = 246
{ Button2 Button47
48
}49
}50
{ HBox1 HBox51
- MoveScaled(0,27,82,4.5714)52
+ MoveScaled(0,29,82,3.1429)53
Spacing = True54
Padding = 255
{ Label2 Label56
57
}58
{ ProgressBar1 ProgressBar59
MoveScaled(7,0,18,4.5714)60
+ Background = Color.TextBackground61
Expand = True62
}63
+ { Separator2 Separator64
+ MoveScaled(26,1,2,4)65
+ }66
{ Label3 Label67
- MoveScaled(26,0,9,3)68
+ MoveScaled(29,0,9,3)69
AutoResize = True70
Text = ("Signal")71
}72
{ sigbar ProgressBar73
- MoveScaled(32,0,18,4.5714)74
+ MoveScaled(36,0,14,5)75
+ Background = Color.TextBackground76
Expand = True77
}78
+ { Separator1 Separator79
+ MoveScaled(51,1,2,3)80
+ }81
{ Label4 Label82
- MoveScaled(51,0,7,3)83
+ MoveScaled(53,0,7,3)84
AutoResize = True85
Text = ("SnR")86
}87
{ snrbar ProgressBar88
- MoveScaled(57,0,18,4.5714)89
+ MoveScaled(60,0,18,4.5714)90
+ Background = Color.TextBackground91
Expand = True92
}93
}94
{ Expander1 Expander95
- MoveScaled(-2,31,81,38)96
+ MoveScaled(0,32,81,38)97
Arrangement = Arrange.Fill98
Margin = True99
+ Border = False100
Text = ("Verbose Log")101
Hidden = True102
{ TextArea1 TextArea103
xt7-player-mpv-0.20.384.tar.gz/.src/Form/FMain.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/FMain.class
Changed
201
1
2
3
'Copyright (C) 2007, 2008 Antonio Orefice4
5
-Private timer_runtime_infos As Timer6
+'Private timer_runtime_infos As Timer7
8
Public AlreadyLoaded As Boolean = False 'true if the form loaded it's settings from disk at least one time9
'Private exportfilespath As String 'mpv 0.11 removed af_export filter :(10
11
SetCDDATabVisibility(False)12
SetChaptersTabVisibility(False)13
SetStyle_early()14
+ If GeneralOptions.ToolTipsCHKDBUS.value Then 15
+ Try ExportDbusProperties()16
+ Endif17
+ 18
+ 'Copy stats lua script to temporary dir19
+ Try File.Save(global.TmpDir & "/_mpvstats.lua", File.Load("_mpvstats.lua"))20
+ If Error Then 21
+ global.mydebug("Cannot copy _mpvstats.lua to " & global.tmpdir)22
+ Stop23
+ Return24
+ Endif25
+26
End27
28
Public Sub InitEarlyForms()29
30
If global.arg_file <> "" Then31
If Exist(global.arg_file, True) Then fmain.ShowBrowseTabTo(global.arg_file)32
Endif33
- If GeneralOptions.ToolTipsCHKDBUS.value Then Try ExportDbusProperties()34
+35
updaterecentfiles()36
37
Try MakeProfileMenu()38
Try GetLastVersion()39
fsform.Move(Screens[fmain.screen].x, Screens[fmain.screen].y, Screens[fmain.screen].w, Screens[fmain.screen].H)40
41
- timer_runtime_infos = New Timer As "timer_runtime_infos"42
- timer_runtime_infos.enabled = False43
+ ' timer_runtime_infos = New Timer As "timer_runtime_infos"44
+ ' timer_runtime_infos.enabled = False45
End46
47
Private Sub MakeProfileMenu()48
49
' Next 'TheForm50
Endif51
52
- audioform.Label1.Foreground = &HFFFF00&53
- audioform.Label1.Font.Italic = True54
- Audioform.Label1.Font.size = Audioform.audiopanel.Font.size + 455
+56
fmain.Statusbar1.Foreground = &HF0F0F0&57
fmain.Statusbar1.Background = &000000&58
59
60
FMain.LoadFormGeometry()61
fmain.Show62
Wait 63
+64
If (Not global.arg_append) And (global.arg_file <> "") Then 65
Media_Next_path = DConv(global.arg_file)66
PlayFromCommandline = True 67
68
Else69
70
FMain.LoadFormGeometry()71
+72
If Not global.arg_start_tray Then fmain.Show73
Endif74
- 75
- Hsplit1_MyRefresh()76
77
DelayTimer.delay = 100078
DelayTimer.Start79
80
Try HotKeys.xbindkeys.kill81
Print "xbindkeys killed"82
83
- If GeneralOptions.SaveOnExitCHK.value = True Then84
- Try Global.SaveAllSettings(global.CurrentProfile)85
- If Error Then 86
- global.myDebug("couldn't save all settings at exit as requested...")87
+ If fmain.fullyloaded Then88
+ If GeneralOptions.SaveOnExitCHK.value = True Then89
+ Try Global.SaveAllSettings(global.CurrentProfile)90
+ If Error Then 91
+ global.myDebug("couldn't save all settings at exit as requested...")92
+ Else93
+ global.myDebug("All settings saved")94
+ Endif95
Else96
- global.myDebug("All settings saved")97
+ global.SaveMandatorySettings(global.CurrentProfile)98
Endif99
- Else100
- global.SaveMandatorySettings(global.CurrentProfile)101
Endif102
103
104
105
Try FormLyrics.close106
Try AudioConvert.close 107
108
- global.myDebug("time to close = " & CStr(Timer() - t0))109
+ 'Deduplicate covers every now ant then...110
+ If (Rnd(0, 10) > 9) Then 111
+ Try global.Dedupe(global.confpath & "/covers/")112
+ Endif113
+ 114
+ global.myDebug("time to close = " & CStr(Timer() - t0))115
Print "Bye"116
Wait 0.5117
Quit118
119
120
121
Public Sub ButtonStop_Click()122
- 123
- ' Return124
- ' Dim a As Integer = 1 / 0125
- 'Stop126
- 'stop timers as soon as possible127
+128
Try mousehider.stop129
Try TimerFullScreen.Stop130
Try mplayer.event_loop.stop131
Try DelayTimer.stop132
133
Try global.Preload_file_bg_stop()134
- Try timer_runtime_infos.stop()135
+ 'Try timer_runtime_infos.stop()136
Try timerqueue.stop()137
switchresBTN.enabled = True138
global.mouse_wait(fmain, False)139
140
Private DbusAlreadyRegistered As Boolean = False141
142
Public Sub ExportDbusProperties()143
-144
If Not DbusAlreadyRegistered Then145
Try DBus.Name = "org.mpris.MediaPlayer2.xt7"146
If Error Then 147
148
opts["cursor-autohide-fs-only"] = "no"149
opts["audio-pitch-correction"] = "no"150
opts["audio-display"] = "no"151
+ 152
Return opts153
End154
155
156
Else157
'parse the chain if we have not a cache158
NewChains.FirstLoadIfNeeded()159
- opts["vo"] = NewChains.parse_drivers(False) 'XConfigureVideoDriver.ParsedVideoDriver()160
- opts["ao"] = NewChains.parse_drivers(True) 'XConfigureAudioDriver.ParsedAudioDriver()161
+ 162
+ For Each opt In newchains.parse_drivers(False)163
+ If opt.data = "" Then opt.data = Chr(8)164
+ While opts.Exist(opt.name)165
+ opt.name = " " & opt.name 'to have multiple options with the same name166
+ Wend167
+ opts[opt.name] = opt.data168
+ Next169
+ 170
+ For Each opt In newchains.parse_drivers(True)171
+ If opt.data = "" Then opt.data = Chr(8)172
+ While opts.Exist(opt.name)173
+ opt.name = " " & opt.name 'to have multiple options with the same name174
+ Wend175
+ opts[opt.name] = opt.data176
+ Next177
+ 178
+ 179
+ 180
+ 'opts["ao"] = NewChains.parse_drivers(True) 'XConfigureAudioDriver.ParsedAudioDriver()181
182
opts["vf-add"] = NewChains.parse_filters(False)183
opts["af-add"] = NewChains.parse_filters(True)184
185
mplayer.watched_properties_old_data.Add("", "duration")186
mplayer.watched_properties_old_data.Add("", "=duration")187
mplayer.watched_properties_old_data.Add("", "percent-pos")188
- mplayer.watched_properties_old_data.Add("", "cache")189
+ mplayer.watched_properties_old_data.Add("", "cache-percent")190
mplayer.watched_properties_old_data.Add("", "media-title")191
mplayer.watched_properties_old_data.Add("", "=aid")192
' mplayer.watched_properties_old_data.Add("", "=vid")193
194
For Each data In opts195
mplayer.set_option(opts.key, data)196
Next197
-198
opts = file_options(fullpath)199
For Each data In opts200
mplayer.set_option(opts.key, data)201
xt7-player-mpv-0.20.384.tar.gz/.src/Form/FMain.form -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/FMain.form
Changed
201
1
2
Text = ("Video Filters")3
Picture = Picture["icon:/medium/video"]4
}5
- { VideoDriversMenuPopup Menu6
- Text = ("Video Drivers")7
- Picture = Picture["icon:/medium/video"]8
- }9
{ AudioFiltersMenuPopup Menu10
Text = ("Audio Filters")11
Picture = Picture["icon:/medium/audio"]12
}13
+ { VideoDriversMenuPopup Menu14
+ Text = ("Video Drivers")15
+ Picture = Picture["icon:/medium/video"]16
+ }17
{ AudioDriversMenuPopup Menu18
Text = ("Audio Drivers")19
Picture = Picture["icon:/medium/audio"]20
21
Text = ("Set a cover")22
Picture = Picture["icon:/16/color"]23
}24
- { MenuEmbeddedCoversLibrary Menu25
- Text = ("Search for embedded covers")26
+ { MenuUpdateCover Menu27
+ Text = ("Update Cover")28
Picture = Picture["icon:/16/attach"]29
}30
{ Separator43057 Menu31
32
Picture = Picture["icon:/22/quit"]33
}34
}35
- { TimerUpdateNowNext #Timer36
- #MoveScaled(44,5)37
- }38
{ HSplit1 HSplit39
MoveScaled(0,5,103,68)40
Tracking = True41
42
{ MyLibraryProgressBar ProgressBar43
MoveScaled(0,52,38,3)44
Visible = False45
+ Background = Color.TextBackground46
}47
Index = 148
Text = ("Albums")49
50
Tag = "flash"51
Text = ("Label3")52
}53
- { TimerFlash #Timer54
- #MoveScaled(9,2)55
- Delay = 200056
- }57
{ Panel5 Panel GridPanels58
Name = "Panel5"59
MoveScaled(2,10,30,15)60
61
AutoResize = True62
Text = ("PopUp window to play new catched videos")63
}64
+ { TimerFlash #Timer65
+ #MoveScaled(9,2)66
+ Delay = 200067
+ }68
Index = 969
Text = ("YouTube")70
Picture = Picture["youtubeicon.png"]71
72
MoveScaled(0,0,35,10)73
Expand = True74
}75
- { TimerTreeDelayExpand #Timer76
- #MoveScaled(24,2)77
- Delay = 5078
- }79
{ scrollviewyt ScrollView80
MoveScaled(0,10,35,13)81
Visible = False82
83
Foreground = &HFFFFFF&84
ToolTip = ("Click to open video page")85
Expand = True86
+ Padding = 687
AutoResize = True88
}89
}90
+ { TimerTreeDelayExpand #Timer91
+ #MoveScaled(24,2)92
+ Delay = 5093
+ }94
}95
{ HBox13 HBox96
MoveScaled(2,28,32,4.5714)97
98
Picture = Picture["icon:/small/tools"]99
}100
}101
- { blinktimer #Timer102
- #MoveScaled(30,31)103
- Delay = 100104
- }105
{ sidepanelYTSearchoptions Panel106
MoveScaled(2,36,32,25)107
Visible = False108
109
Text = ("Order by")110
}111
{ ComboBoxOrderBy ComboBox112
- MoveScaled(9.4286,-36.2857,18,4.5714)113
+ MoveScaled(9.4286,-44.2857,18,4.5714)114
#Translate = False115
Expand = True116
ReadOnly = True117
118
}119
}120
}121
+ { blinktimer #Timer122
+ #MoveScaled(30,31)123
+ Delay = 100124
+ }125
Index = 10126
Text = ("Radio")127
Picture = Picture["iradio.png"]128
129
Expand = True130
Text = ("Select next")131
}132
+ { HBox3 HBox133
+ MoveScaled(14,1,5,3)134
+ Expand = True135
+ }136
{ Button2 Button137
MoveScaled(12,0,12,4.5714)138
Text = ("Refresh")139
Picture = Picture["icon:/16/refresh"]140
}141
- { HBox3 HBox142
- MoveScaled(14,1,5,3)143
- Expand = True144
- }145
{ ButtonTag Button146
MoveScaled(21,0,12,4.5714)147
Text = ("Commit")148
149
Expand = True150
}151
}152
- { ABLoopTimer #Timer153
- #MoveScaled(1,6)154
- Delay = 75155
- }156
{ OuterBox Panel VideoAreaGroup157
Name = "OuterBox"158
MoveScaled(4,15,24,28)159
160
{ BottomVbox VBox161
MoveScaled(0,48,71,14)162
Background = Color.Background163
- { ControlFrame Frame164
- MoveScaled(1,3,70,10)165
+ { ControlFrame Panel166
+ MoveScaled(-13,1,72,10)167
Font = Font["6"]168
{ PictureBox1 PictureBox169
- MoveScaled(1,1,60,7)170
+ MoveScaled(2,0,60,7)171
Tracking = True172
Drop = True173
Expand = True174
175
Picture = Picture["media-playback-stop.png"]176
}177
{ ChaptersBtn Button178
- MoveScaled(15,0,4,4.5714)179
+ MoveScaled(16,-1,4,4.5714)180
Visible = False181
Font = Font["1"]182
ToolTip = ("Chapters available")183
184
Border = False185
}186
{ Panel9 Panel187
- MoveScaled(19,1,54,17)188
+ MoveScaled(21,3,14.2857,17)189
Expand = True190
Arrangement = Arrange.Fill191
Padding = 8192
{ ProgressFrame DrawingArea193
- MoveScaled(0,0,53,16)194
+ MoveScaled(3,0,53,16)195
Expand = True196
Border = Border.Plain197
{ Progress PictureBox198
- MoveScaled(5,1,6,4.5714)199
+ MoveScaled(6,1,6,4.5714)200
Picture = Picture["barglow.png"]201
xt7-player-mpv-0.20.384.tar.gz/.src/Form/FormLyrics.form -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/FormLyrics.form
Changed
83
1
2
Arrangement = Arrange.Vertical3
Margin = True4
{ Panel2 HBox5
- MoveScaled(0,5,86,3)6
+ MoveScaled(0,5,86,4.5714)7
AutoResize = True8
+ Margin = True9
{ NextBTN Button10
MoveScaled(0,0,9,4.5714)11
AutoResize = True12
13
MoveScaled(11,0,2,4.5714)14
}15
{ ComboUrls ComboBox16
- MoveScaled(13,0,57,4.5714)17
+ MoveScaled(13,0,57,3.1429)18
Expand = True19
}20
{ ButtonZoomOut Button21
22
{ TextLabel1 TextLabel23
MoveScaled(4,2,45,48)24
Expand = True25
- Text = ("Please wait...")26
+ Text = ("Please wait") & "..."27
}28
}29
{ TextArea1 TextArea30
31
Text = ("TextArea1")32
}33
{ Panel3 HBox34
- MoveScaled(1,77,86,3)35
+ MoveScaled(1,77,86,4)36
AutoResize = True37
+ Spacing = True38
+ Margin = True39
{ Label1 Label40
- MoveScaled(0,0,5,4.5714)41
+ MoveScaled(0,0,5,4)42
AutoResize = True43
Text = ("Artist")44
}45
{ textartist TextArea46
- MoveScaled(15,0,17,4.5714)47
+ MoveScaled(15,0,17,4)48
Expand = True49
+ Alignment = Align.Center50
ScrollBar = Scroll.None51
}52
{ Separator1 Separator53
- MoveScaled(34,0,2,4.5714)54
+ MoveScaled(34,0,2,4)55
}56
{ Label2 Label57
- MoveScaled(38,0,4,4.5714)58
+ MoveScaled(38,0,4,4)59
AutoResize = True60
Text = ("Title")61
}62
{ textsong TextArea63
- MoveScaled(43,0,25,4.5714)64
+ MoveScaled(43,0,25,4)65
Expand = True66
+ Alignment = Align.Center67
ScrollBar = Scroll.None68
}69
{ Separator2 Separator70
- MoveScaled(70,-1,1,4.5714)71
+ MoveScaled(70,-1,1,4)72
}73
{ ButtonNewSearch Button74
- MoveScaled(73,0,14,4.5714)75
+ MoveScaled(73,0,14,4)76
AutoResize = True77
Text = ("New search")78
Picture = Picture["icon:/22/find"]79
- Border = False80
}81
}82
}83
xt7-player-mpv-0.20.384.tar.gz/.src/Form/GeneralOptions.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/GeneralOptions.class
Changed
201
1
2
3
Private LastDirectory As String = ""4
5
+Public Struct MpvOptionInfo 6
+ name As String7
+ type As String8
+ default_value As Variant9
+ min As Variant10
+ max As Variant11
+ choices As String[]12
+End Struct13
14
Public Sub FirstLoadIfNeeded()15
If Not initdone Then Init()16
17
Tabstrip1.index = PrevIndex18
'hardware decoding macro19
Try hwdec_choice = Split(NOPARSE_HwdecCombobox.text, " ")[0]20
+ 21
If Not Error Then22
myopts.Add(newopt("hwdec", Split(NOPARSE_HwdecCombobox.text, " ", "", True)[0]))23
Endif24
25
If Right(pt) = "," Then pt = Left(pt, -1)26
'If pt <> "" Then myopts.Add(newopt("ad", pt))27
If pt <> "" Then myopts.Add(newopt("audio-spdif", pt))28
+29
Return myopts.Insert(parse_custom_options())30
31
End32
33
Dim myopts As New MpvOption[]34
Dim visstring As String35
Dim t1 As String36
-37
- t1 = Temp()38
+ 39
+ t1 = global.tmpdir & "/pic.tmp" 40
+ Try Kill t141
Select Case Left(NoParseVisType2.text)42
Case "1"43
- visstring = "'[aid1]asplit=3 [azero][auno][ao];[azero]showspectrum=mode=separate:color=intensity:slide=scroll:s=4x512:color=intensity:win_func=blackman:mode=combined:saturation=1,crop=h=(in_h/1.5):y=in_h,scale=h=512:w=512:force_original_aspect_ratio=disable[spectrum];[auno]showwaves=s=512x512:mode=line:r=20,crop=h=(ih/2):y=(0),crop=h=(ih/2):y=ih,colorlevels=romax=0.5:bomin=1:gomin=1[waves];[spectrum][waves]overlay[vo]'"44
+ Copy "shade_alpha.png" To t145
+ visstring = "'[aid1]asplit=3 [azero][auno][ao];[azero]showspectrum=mode=separate:color=intensity:slide=scroll:s=4x512:color=intensity:win_func=blackman:mode=combined:saturation=1,crop=h=(in_h/1.5):y=in_h,scale=h=512:w=512:force_original_aspect_ratio=disable[spectrum];[auno]showwaves=s=512x512:mode=line:r=20,crop=h=(ih/2):y=(0),crop=h=(ih/2):y=ih,colorlevels=romax=0.5:bomin=1:gomin=1[waves];movie=" & t1 & ",scale=h=(128):w=512[pic];[spectrum][pic]overlay[overlay1];[overlay1][waves]overlay[vo]'"46
+ 'visstring = "'[aid1]asplit=3 [azero][auno][ao];[azero]showspectrum=mode=separate:color=intensity:slide=scroll:s=4x512:color=intensity:win_func=blackman:mode=combined:saturation=1,crop=h=(in_h/1.5):y=in_h,scale=h=512:w=512:force_original_aspect_ratio=disable[spectrum];[auno]showwaves=s=512x512:mode=line:r=20,crop=h=(ih/2):y=(0),crop=h=(ih/2):y=ih,colorlevels=romax=0.5:bomin=1:gomin=1[waves];[spectrum][waves]overlay[vo]'"47
Case "2"48
- visstring = "'[aid1]asplit=3 [azero][auno][ao];[azero]showspectrum=mode=separate:color=intensity:slide=scroll:s=4x512:color=intensity:win_func=blackman:mode=combined:saturation=1,crop=h=(in_h/1.5):y=in_h,scale=h=512:w=512:force_original_aspect_ratio=disable[spectrum];[auno]showwaves=s=512x512:mode=line:r=20,crop=h=(in_h):y=(in_h/2),colorkey=0x000000:0.1:0.5,colorlevels=romax=0.5:bomin=1:gomin=1[waves];[spectrum][waves]overlay[vo]'"49
+ Copy "shade_alpha.png" To t150
+ visstring = "'[aid1]asplit=3 [azero][auno][ao];[azero]showspectrum=mode=separate:color=intensity:slide=scroll:s=4x512:color=intensity:win_func=blackman:mode=combined:saturation=1,crop=h=(in_h/1.5):y=in_h,scale=h=512:w=512:force_original_aspect_ratio=disable[spectrum];[auno]showwaves=s=512x512:mode=line:r=20,crop=h=(in_h):y=(in_h/2),colorkey=0x000000:0.1:0.5,colorlevels=romax=0.5:bomin=1:gomin=1[waves];movie=" & t1 & ",scale=h=(128):w=512[pic];[spectrum][pic]overlay[overlay1];[overlay1][waves]overlay[vo]'"51
Case "3"52
Copy "shade_alpha.png" To t153
visstring = "'[aid1]asplit [a][ao];[a]showspectrum=mode=separate:color=intensity:slide=scroll:s=4x256:color=intensity:win_func=blackman:mode=combined:saturation=1,crop=h=(in_h/1.5):y=in_h[spectrum];movie=" & t1 & ",scale=h=(in_h/1.5)[pic];[spectrum][pic]overlay[vo]'"54
55
If visstring <> "" Then56
myopts.Add(newopt("keepaspect", "no"))57
myopts.Add(newopt("lavfi-complex", visstring))58
+ myopts.Add(newopt("osd-level", "0"))59
+ myopts.Add(newopt("osd-color", "#00000000"))60
+ myopts.Add(newopt("osd-scale", "0.01"))61
+62
+ If global.mpv_version = "" Then global.mpv_version = fmain.mplayer.version()63
+ If global.mpv_version = "0.21.0" Then64
+ myopts.Add(newopt("hr-seek", "yes"))65
+ Endif66
+ 67
Endif68
Return myopts69
End70
71
72
Public Sub ApplyBTN_Click()73
74
-Debug NoParse55ab.visible75
-76
FMain.Apply77
Wait 0.178
'IF ((NOT FMain.mplayer.ProcessRunningOvr()) OR (Fmain.mplayer.paused)) OR (GeneralOptions.Tabstrip1.caption = ("Style")) THEN 'apply style changes only if mplayer is not running.79
80
If MyHbox Is Hbox Then81
If MyHbox.children[0] Is Checkbox Then82
MyCheckbox = MyHbox.children[0]83
- If MyCheckbox.value Then 84
- opt = New MpvOption85
- opt.name = MyCheckbox.next.text86
- opt.data = MyCheckbox.next.next.next.text87
- opts.add(opt)88
+ If MyCheckbox.value Then89
+ If Trim(MyCheckbox.next.text) <> "" Then 90
+ opt = New MpvOption91
+ opt.name = MyCheckbox.next.text92
+ opt.data = MyCheckbox.next.next.next.text93
+ opts.add(opt)94
+ Endif95
Endif96
Endif97
Endif98
99
If o Is Hbox Then100
If o.Children[0] Is CheckBox Then101
c = o.Children[1]102
+ Object.Lock(c)103
c.enabled = o.Children[0].value104
c.Next.next.enabled = c.enabled105
If c.List.count < 2 Then 106
107
Next108
c.text = t109
Endif110
+ Object.unLock(c)111
Endif112
Endif113
Next114
115
If Last.value = False Then 116
fmain.SetProgressCache(0)117
Else118
- If fmain.mplayer.ProcessRunningOvr() Then fmain.Update_cache_percent(fmain.mplayer.get_property_mpv("cache", True, 1, True))119
+ If fmain.mplayer.ProcessRunningOvr() Then fmain.Update_cache_percent(fmain.mplayer.get_property_mpv("cache-percent", True, 1, True))120
Endif121
End122
123
124
fmain.mplayer.volumeproperty = "ao-volume"125
Endif126
End127
+128
+Public Sub OLD_ComboOption_Click()129
+ Dim values As New String[]130
+ Dim value, prev_value As String131
+ Dim combonext As Combobox132
+ Dim option_infos As Collection133
+ Dim option_info As MpvOptionInfo134
+ Dim i, imin, imax, istep As Long135
+ Dim choice As String136
+ If Not alreadyloaded Then Return137
+ If Not fmain.fullyloaded Then Return138
+ 139
+ If Not (Last.next.next Is Combobox) Then Return140
+ combonext = Last.next.next141
+142
+143
+ option_infos = fmain.mplayer.options_info()144
+ If Not option_infos.Exist(Last.text) Then Return145
+146
+' A questo punto, hai tutto, devi solo immaginare come parsare i valori e inserirli nella combobox147
+ 148
+' combonext.text = prev_value 149
+ option_info = option_infos[Last.text]150
+ 151
+ prev_value = combonext.text152
+ combonext.Clear153
+154
+155
+ If (Lower(option_info.type) = "integer") Or Lower(option_info.type) = "float" Then156
+ If option_info.min <> "" Then157
+ If option_info.max <> "" Then158
+ imin = CInt(CFloat(option_info.min)) 159
+ imax = CInt(CFloat(option_info.max)) 160
+ istep = (imax - imin) Div 10161
+ If istep < 1 Then istep = 1162
+ 'fill min to max values, max 10 values163
+ For i = imin To imax Step istep164
+ If (Lower(option_info.type) = "integer") Then 165
+ combonext.Add(i)166
+ Else167
+ combonext.Add(i & ".000")168
+ Endif169
+ Next 'i170
+ 'make sure last value is the max171
+ If (Lower(option_info.type) = "float") Then 172
+ If combonext[combonext.count - 1].text <> imax & ".000" Then173
+ Stop174
+ combonext.Add(imax & ".000")175
+ Endif176
+ Else177
+ If combonext[combonext.count - 1].text <> imax Then178
+ combonext.Add(imax)179
+ Endif180
+ Endif181
+ Endif182
+ Endif183
+ Endif184
+185
+ 186
+ 187
+ If (Lower(option_info.type) = "flag") Then188
+ combonext.Add("yes")189
+ combonext.Add("no")190
+ Endif191
+192
+ If Not (option_info.choices = Null) Then193
+ If (option_info.min = "") And (option_info.max = "")194
+ For Each choice In option_info.choices195
+ combonext.Add(choice)196
+ Next197
+ Endif198
+ Endif199
+200
+ 'If Trim(prev_value) = "" Then 201
xt7-player-mpv-0.20.384.tar.gz/.src/Form/GeneralOptions.form -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/GeneralOptions.form
Changed
201
1
2
}3
}4
{ GENERALOPTIONSFRAME Frame5
- MoveScaled(0,0,86,69)6
+ MoveScaled(0,0,96,69)7
Expand = True8
{ VBox1 VBox9
MoveScaled(1,1,22,67)10
11
}12
}13
{ Tabstrip1 TabStrip14
- MoveScaled(27,0,62,67)15
+ MoveScaled(25,0,64,67)16
Tag = "User options"17
Expand = True18
Arrangement = Arrange.Vertical19
20
}21
{ NoParseBox123 Panel22
MoveScaled(2,16,47,4.5714)23
- ToolTip = ("Select the preferred hardware decoding method.\n(decode api + video output driver)\n\nCaveats that applies to anything but \"no\" and \"vaapi-copy\"\n- Any video driver in the chains window is overriden\n- Use of video filters will disable hardware decoding")24
+ ToolTip = ("Select the preferred hardware decoding method.\n(decode api + video output driver)\n\nCaveats that applies to anything but \"no\" and \"*-copy\"\n- Any video driver in the chains window is overriden\n- Use of video filters will disable hardware decoding")25
Arrangement = Arrange.Horizontal26
Spacing = True27
Indent = True28
29
}30
{ NOPARSE_HwdecCombobox ComboBox31
MoveScaled(20,0,27,4.5714)32
- #Translate = False33
- ToolTip = "Select the preferred hardware decoding method.\n(decode api + video output driver)\n\nCaveats that applies to anithing but \"no\" and \"vaapi-copy\"\n- Any video driver in the chains window is overriden\n- Use of video filters will disable hardware decoding"34
+ ToolTip = ("Select the preferred hardware decoding method.\n(decode api + video output driver)\n\nCaveats that applies to anything but \"no\" and \"vaapi-copy\"\n- Any video driver in the chains window is overriden\n- Use of video filters will disable hardware decoding")35
Expand = True36
ReadOnly = True37
- List = ["no (allows all video filters and drivers)", "auto + opengl (may allows only gamma adjustments)", "auto + vdpau (allows equalization, but gamma)", "auto + vaapi (allows equalization, but gamma)", "vdpau + vdpau (allows equalization, but gamma)", "vdpau + opengl (may allows only gamma adjustments)", "vaapi + vaapi (allows equalization, but gamma)", "vaapi + opengl (allows only gamma adjustments)", "vaapi-copy (allows all video filters and drivers - Intel only)"]38
- Text = "0 - disabled (allow all video processing filters)"39
+ List = [("no (allows all video filters and drivers)"), ("auto + opengl (may allows only gamma adjustments)"), ("auto + vdpau (allows equalization, but gamma)"), ("auto + vaapi (allows equalization, but gamma)"), ("vdpau + vdpau (allows equalization, but gamma)"), ("vdpau + opengl (may allows only gamma adjustments)"), ("vaapi + vaapi (allows equalization, but gamma)"), ("vaapi + opengl (allows only gamma adjustments)"), ("vaapi-copy (allows all video filters and drivers - Intel only)"), ("cuda + opengl (check if your ffmpeg and mpv supports it)"), ("cuda-copy (see previous)")]40
+ Text = ("no (allows all video filters and drivers)")41
}42
}43
{ Panel3 HBox44
45
ToolTip = ("Select an audio driver and an audio device at once.\nNote that any audio driver explicitaly selected in the chains window\nwill override this setting.\n\nmpv option: --audio-device")46
Spacing = True47
{ UseMpvInternalMixerCheckBox CheckBox48
- MoveScaled(1,0,43,4.5714)49
+ MoveScaled(1,0,47,5)50
ToolTip = ("Checked: volume changes will affect the internal mpv volume.\nUnchecked: volume changes will change the system volume:\n(on ALSA this usually changes system-wide audio,\nwhile with PulseAudio, this controls per-application volume.)\n\nHINT: Pulseaudio users may want to UNCHECK this.")51
AutoResize = True52
- Text = ("Use mpv internal mixer (disables maximum amplification)")53
+ Text = ("Use mpv internal mixer (enables maximum amplification)")54
}55
}56
}57
58
Value = CheckBox.True59
}60
}61
+ { NOPARSESEP1 Separator62
+ MoveScaled(4,48,45,1)63
+ }64
{ NoParse20 HBox65
MoveScaled(1,47,50,4.5714)66
ToolTip = ("Enable/Disbale the tray icon")67
68
Text = ("Use Tray icon (xt7-player restart needed)")69
}70
}71
- { NOPARSESEP1 Separator72
- MoveScaled(4,48,45,1)73
- }74
{ NoParse12 HBox75
MoveScaled(1,51,50,4.5714)76
Spacing = True77
78
Index = 1179
Text = ("User Options")80
{ ScrollViewUserOptions ScrollView81
- MoveScaled(1,0,60,62)82
+ MoveScaled(-1,0,64,62)83
Tag = "Audio CD"84
Expand = True85
Arrangement = Arrange.Vertical86
87
Margin = True88
Padding = 689
{ NOPARSELabel25 Label90
- MoveScaled(1,1,57,3)91
+ MoveScaled(-15,1,57,3)92
Text = ("The following options will be appended to mpv command line:")93
}94
{ NoParseUserOption1 HBox95
96
Spacing = True97
{ UserOptionChackbox1 CheckBox notifyobj98
Name = "UserOptionChackbox1"99
- MoveScaled(1,0,5,4.5714)100
+ MoveScaled(1,0,5,5)101
}102
- { ComboBox1 ComboBox103
- MoveScaled(7,0,22,4.5714)104
+ { ComboBox1 ComboBox ComboOption105
+ Name = "ComboBox1"106
+ MoveScaled(9,-1,16,5)107
Expand = True108
}109
{ TextLabel1 TextLabel110
- MoveScaled(30,0,4,4.5714)111
+ MoveScaled(27,0,4,4.5714)112
AutoResize = True113
Text = ("=")114
Alignment = Align.Center115
}116
- { NOPARSEAdditionaldata1 TextBox117
- MoveScaled(34,0,22,4.5714)118
+ { NOPARSEAdditionaldata1 ComboBox uservalue119
+ Name = "NOPARSEAdditionaldata1"120
+ MoveScaled(31,0,17.1429,4.5714)121
Expand = True122
}123
}124
{ NoParseUserOption2 HBox125
- MoveScaled(-1,9,57,4.5714)126
+ MoveScaled(1,10,57,4.5714)127
ToolTip = ("mpv options in the format \"name = value\"")128
AutoResize = True129
Spacing = True130
{ UserOptionChackbox2 CheckBox notifyobj131
Name = "UserOptionChackbox2"132
- MoveScaled(1,0,5,4.5714)133
+ MoveScaled(1,0,5,5)134
}135
- { ComboBox2 ComboBox136
- MoveScaled(9,0,22,4.5714)137
+ { ComboBox2 ComboBox ComboOption138
+ Name = "ComboBox2"139
+ MoveScaled(9,-1,16,5)140
Expand = True141
}142
{ TextLabel2 TextLabel143
- MoveScaled(30,0,4,4.5714)144
+ MoveScaled(27,0,4,4.5714)145
AutoResize = True146
Text = ("=")147
Alignment = Align.Center148
}149
- { NOPARSEAdditionaldata2 TextBox150
- MoveScaled(34,0,22,4.5714)151
+ { NOPARSEAdditionaldata2 ComboBox uservalue152
+ Name = "NOPARSEAdditionaldata2"153
+ MoveScaled(31,0,17.1429,4.5714)154
Expand = True155
}156
}157
- { NoParseUserOption3 HBox158
- MoveScaled(-1,13,57,4.5714)159
+ { NoParseUserOption4 HBox160
+ MoveScaled(1,15,57,4.5714)161
ToolTip = ("mpv options in the format \"name = value\"")162
AutoResize = True163
Spacing = True164
- { UserOptionChackbox3 CheckBox notifyobj165
- Name = "UserOptionChackbox3"166
- MoveScaled(1,0,5,4.5714)167
+ { UserOptionChackbox4 CheckBox notifyobj168
+ Name = "UserOptionChackbox4"169
+ MoveScaled(1,0,5,5)170
}171
- { ComboBox3 ComboBox172
- MoveScaled(9,0,22,4.5714)173
+ { ComboBox4 ComboBox ComboOption174
+ Name = "ComboBox4"175
+ MoveScaled(9,-1,16,5)176
Expand = True177
}178
- { TextLabel3 TextLabel179
- MoveScaled(31,0,4,4.5714)180
+ { TextLabel4 TextLabel181
+ MoveScaled(27,0,4,4.5714)182
AutoResize = True183
Text = ("=")184
Alignment = Align.Center185
}186
- { NOPARSEAdditionaldata3 TextBox187
- MoveScaled(34,0,22,4.5714)188
+ { NOPARSEAdditionaldata4 ComboBox uservalue189
+ Name = "NOPARSEAdditionaldata4"190
+ MoveScaled(31,0,17.1429,4.5714)191
Expand = True192
}193
}194
- { NoParseUserOption4 HBox195
- MoveScaled(-2,19,57,4.5714)196
+ { NoParseUserOption3 HBox197
+ MoveScaled(1,20,57,4.5714)198
ToolTip = ("mpv options in the format \"name = value\"")199
AutoResize = True200
Spacing = True201
xt7-player-mpv-0.20.384.tar.gz/.src/Form/MyQuestion.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/MyQuestion.class
Changed
139
1
2
Public answer As Integer = -13
Private MessageAlreadyShown As Boolean = False4
5
-Public Function OLDAsk(TheQuestionString As String, TheButton1String As String, TheButton2String As String, Optional CheckboxString As String = "", Optional CheckboxObject As Checkbox) As Integer6
- If MessageAlreadyShown Then answer = 57
- Wait 18
- If Not MessageAlreadyShown Then9
- MessageAlreadyShown = True10
- answer = -111
- QuestionLabel.text = TheQuestionString12
- Button1.text = TheButton1String13
- Button2.text = TheButton2String14
- Me.x = Mouse.screenx - (Me.w Div 2)15
- Me.y = Mouse.screeny - Me.h - 9016
- Checkbox1.visible = (Checkboxstring <> "")17
- If checkboxstring <> "" Then18
- Checkbox1.text = CheckboxString19
- Checkbox1.value = Checkboxobject.value20
-21
- Checkbox1.Width = Checkbox1.Font.TextWidth(Checkbox1.text) + MyIcon.Width + 32 + FMain.padding + FMain.spacing22
- Endif23
- Me.show24
- Repeat25
- Wait 0.2526
- Until answer <> -127
- If checkboxstring <> "" Then Checkboxobject.value = Checkbox1.value28
- MyQuestion.close29
- MyQuestion.hide30
- MessageAlreadyShown = False31
- Return answer32
- Else33
- Return -134
- Endif35
-End36
37
Public Function Ask(TheQuestionString As String, TheButton1String As String, TheButton2String As String, Optional CheckboxString As String = "", Optional CheckboxObject As Checkbox) As Integer38
-39
+ Wait 0.2 'bug with qt5 that makes xt7 unresponsive40
If Not MessageAlreadyShown Then41
MessageAlreadyShown = True42
answer = -143
44
Button2.text = TheButton2String45
Button1.W = Button1.Font.TextWidth(Button1.text & "------")46
Button2.W = Button2.Font.TextWidth(Button2.text & "------")47
- Me.x = Mouse.screenx - (Me.w Div 2)48
- Me.y = Mouse.screeny - Me.h '- 9049
- If Me.x <= 0 Then Me.x = 150
- If Me.y <= 0 Then Me.y = 151
52
Checkbox1.visible = (Checkboxstring <> "")53
If checkboxstring <> "" Then54
55
Checkbox1.value = Checkboxobject.value56
Checkbox1.Width = Checkbox1.Font.TextWidth(Checkbox1.text) + 3257
Endif58
- Wait59
- Me.Show()60
- Me.Refresh()61
- Wait62
- global.myDebug(vbox1.w)63
- 'Me.w = Max((QuestionLabel.w + MyIcon.w), (Button1.W + Button2.W + vbox2.w + vbox1.w)) + (Me.padding * 3)64
- Me.w = Max((QuestionLabel.w + MyIcon.w), (Button1.W + Button2.W)) + (Desktop.scale * 8)65
- Me.h = Button1.h + Max(questionlabel.Font.TextHeight("|"), MyIcon.h) + (Desktop.scale * 4)66
+67
If Checkbox1.visible Then Me.h += Checkbox1.h68
- Me.Hide()69
+70
Me.ShowModal()71
72
- Repeat73
- Wait '0.2574
- Until (answer <> -1) Or (Me.visible = False)75
If checkboxstring <> "" Then Checkboxobject.value = Checkbox1.value76
- 'MyQuestion.close77
- 'MyQuestion.hide78
+79
MessageAlreadyShown = False80
Return answer81
Else82
83
Endif84
End85
86
+Private Sub shrink()87
+Me.minimized = True88
+ Me.autoresize = False89
+ questionlabel.autoresize = False90
+ hbox1.autoresize = False91
+ Me.autoresize = False92
+ Me.Resize(64, 64)93
+ questionlabel.Resize(64, 64)94
+ hbox1.Resize(64, 64)95
+ questionlabel.autoresize = True96
+ hbox1.autoresize = True97
+ Me.autoresize = True98
+End99
+100
101
Public Sub Button1_Click()102
- MyQuestion.hide103
+ MyQuestion.close104
answer = 1105
-End106
+ End107
108
Public Sub Button2_Click()109
- MyQuestion.hide110
+ MyQuestion.close111
answer = 2112
End113
114
Public Sub MyQuestion_Close()115
- Me.hide116
+ Me.Opacity = 0117
+ shrink()118
+ Me.opacity = 100119
answer = 3120
End121
122
-Public Sub Form_Hide()123
- Me.SkipTaskbar = False124
-End125
-126
-Public Sub Form_Show()127
- Me.SkipTaskbar = True128
-End129
-130
-Public Sub ButtonContainer_MouseDown()131
-132
- 133
-134
-End135
-136
Public Sub Button1_KeyPress()137
If (Key.code = Key.return) Or (Key.code = Key.enter) Then Button1_Click()138
End139
xt7-player-mpv-0.20.384.tar.gz/.src/Form/MyQuestion.form -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/MyQuestion.form
Changed
52
1
2
MoveScaled(0,0,36,22)3
Visible = False4
Icon = Picture["icon:/16/question"]5
- Persistent = True6
Resizable = False7
- Stacking = Window.Above8
SkipTaskbar = True9
Arrangement = Arrange.Vertical10
+ AutoResize = True11
+ Spacing = True12
Margin = True13
Padding = 814
{ HBox1 Panel15
- MoveScaled(1,1,31,5)16
+ MoveScaled(1,3,31,5)17
Arrangement = Arrange.Horizontal18
AutoResize = True19
Spacing = True20
21
Visible = False22
Text = ("CheckBox1")23
}24
- { ButtonContainer HBox25
+ { ButtonContainer Panel26
MoveScaled(0,16,33,6)27
+ Arrangement = Arrange.Horizontal28
AutoResize = True29
Spacing = True30
- { VBox1 VBox31
- MoveScaled(0,0,3,4.5714)32
- Expand = True33
- }34
{ Button1 Button35
MoveScaled(2,1,13,4.5714)36
+ Expand = True37
AutoResize = True38
Text = ("Button1")39
}40
{ Button2 Button41
MoveScaled(16,1,14,4.5714)42
+ Expand = True43
AutoResize = True44
Text = ("Button2")45
}46
- { VBox2 VBox47
- MoveScaled(30,1,3,4.5714)48
- Expand = True49
- }50
}51
}52
xt7-player-mpv-0.20.384.tar.gz/.src/Form/NewChains.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/NewChains.class
Changed
201
1
2
Public AlreadyLoaded As Boolean = False 'true if the form loaded it's settings from disk at least one time3
Public InitDone As Boolean = False4
5
+Public Struct mpvOption6
+ name As String7
+ data As String8
+End Struct9
+10
+Private Function newopt(name As String, data As String) As MpvOption11
+ Dim myopt As New MpvOption12
+ myopt.name = name13
+ myopt.data = data14
+ Return myopt15
+End16
+17
+18
+19
Private Sub fill_tabstrip(aTabstrip As Tabstrip, aScrollview As Scrollview)20
Dim i As Integer21
Dim tabScrollview As ScrollView22
23
Private Sub Init_drivers_audio()24
Dim drivers_audio_list As New String[]25
Dim driver As String26
- drivers_audio_list = ["alsa", "pulse", "jack", "pcm", "custom audio", "null"]27
+ drivers_audio_list = ["alsa", "pulse", "jack", "pcm", "null"]28
For Each driver In drivers_audio_list29
draw_list_item(drivers_audio_container, driver)30
Next31
32
Private Sub Init_drivers_video()33
Dim drivers_video_list As New String[]34
Dim driver As String35
- drivers_video_list = ["opengl", "xv", "vdpau", "vaapi", "x11", "custom video", "null"]36
+ drivers_video_list = ["opengl", "xv", "vdpau", "vaapi", "x11", "null"]37
For Each driver In drivers_video_list38
draw_list_item(drivers_video_container, driver)39
Next40
41
filter_button_up = New Button(filter_box) As "filter_button_up"42
filter_button_up.border = False43
filter_button_up.text = ""44
- filter_button_up.w = 1645
- filter_button_up.h = 1646
+ filter_button_up.w = 2047
+ filter_button_up.h = 2048
filter_button_up.picture = stock["16/up"]49
50
'a button to move the item in the list51
52
filter_button_down.border = False53
filter_button_down.picture = stock["16/down"]54
filter_button_down.text = ""55
- filter_button_down.w = 1656
- filter_button_down.h = 1657
+ filter_button_down.w = 2058
+ filter_button_down.h = 2059
60
'a checkbox to enable/disable the item61
filter_checkbox = New CheckBox(filter_box) As "filter_checkbox"62
63
64
Private Sub select_item(item As Object)65
Dim bro As Object66
+ Dim ovr As String67
+ 68
If item.parent.parent.enabled Then69
For Each bro In item.parent.parent.Children70
If bro Is HBox Then71
72
Next73
item.parent.background = Color.SelectedBackground74
item.parent.foreground = Color.SelectedForeground75
+ 76
+ Select_tabstrip_item(item.parent.name, item.parent.parent.tag) 77
Endif78
- Select_tabstrip_item(item.parent.name, item.parent.parent.tag)79
-80
+ 81
+ 82
+ 83
+ 84
If textareahelp.visible Then85
timerDelayShowHelp.start86
Endif87
88
AllParams.add(["RANGEFLOAT", "limit", "0.1", "1", "1", "alimiter3", ""]) 89
AllParams.add(["RANGE", "attack", "1", "5", "80", "alimiter4", ""]) 90
AllParams.add(["RANGE", "release", "1", "2000", "8000", "alimiter5", ""]) 91
+ 92
+ 93
+ AllParams.add(["RANGE", "asc", "0", "1", "1", "alimiter6", ("Keep asc =1 active to avoid distortions on systems with more than 2 speakers")]) 94
+ AllParams.add(["RANGEFLOAT", "asc_level", "0", "1", "1", "alimiter7", ""]) 95
+ 96
AllParams.Add(["TIP", ("This filter is a good volume normalizer"), "alimiter6", ""])97
AllParams.Add(["TIP", ("It is best to place the volume filter after alimiter"), "alimiter7", ""])98
Global.DrawGui(AllParams, "alimiter", aTabstrip, False,,, "lavfi")99
100
Endif101
Else102
If parse Then103
- Print subobject.name104
TmpString = global.RemoveShortcut(TmpString & ":")105
Endif106
Endif107
108
109
110
111
-Private Function OLD_Parse_video_filter(Filtername As String) As String112
- 'will parse the tabstrip at filtername index and output113
- 'a commandline to add a filter in mplayer114
- Dim ParsedFilter As String = Lower(FilterName)115
- Dim TmpString As String = ""116
- Dim MyScrollView As Object 'the scrollview present in every tab, parent of all the controls in the tab117
- Dim PanelObject As Object 'the Hbox which contains a single parameter it Is Created by DrawFiltersGui118
- Dim SubObject As Object119
- Dim aTabstrip As Tabstrip = TabStrip_filters_video120
- Dim i As Integer121
- Dim parse As Boolean = True122
- Dim out As String123
- Dim is_lavfi As Boolean = False124
- i = aTabstrip.index125
- 'Find the ParsedFilter Tab and activate it:126
- aTabstrip.index = Global.TabIndexByName(ParsedFilter, aTabstrip)127
- If Parsedfilter Like "customvideo*" Then128
- out = Parse_video_filter_Custom()129
- aTabstrip.index = i130
- Return out131
- Else132
- 'Discend the Tab objects,parse them and build the commandline133
- 'hierarchy is:134
- 'Tabstrip -> scrollviews -> Panels -> ParameterObjects135
- For Each MyScrollview In aTabstrip.Children136
- If MyScrollView.tag = "lavfi" Then is_lavfi = True137
- For Each PanelObject In MyScrollView.Children138
- If PanelObject.name Like "*HBox" Then139
- For Each SubObject In PanelObject.Children140
- If Not (SubObject Is Label) Then141
- If Not ((SubObject Is Checkbox) Or (subobject.name Like "NOPARSE*")) Then142
- parse = True143
- ' Stop144
- ' If PanelObject.tag = "lavfi" Then145
- ' Break146
- ' Endif147
- Else148
- parse = SubObject.value '(is a checkbox,parse only if it is checked)149
- Endif150
- If SubObject.text <> "" Then151
- If parse Then TmpString = global.RemoveShortcut(TmpString & Split(SubObject.text, " ")[0] & ":")152
- Else153
- If parse Then TmpString = global.RemoveShortcut(TmpString & ":")154
- Endif155
- Endif156
- Next157
- Endif158
- Next159
- Next160
- TmpString = Left(Tmpstring, Len(TmpString) - 1)161
- aTabstrip.index = i162
- If tmpstring <> "" Then parsedfilter = ParsedFilter & "=" & TmpString163
- If is_lavfi Then parsedfilter = "lavfi=[" & parsedfilter & "]"164
- Return ParsedFilter165
-166
- Endif167
-End168
+' Private Function OLD_Parse_video_filter(Filtername As String) As String169
+' 'will parse the tabstrip at filtername index and output170
+' 'a commandline to add a filter in mplayer171
+' Dim ParsedFilter As String = Lower(FilterName)172
+' Dim TmpString As String = ""173
+' Dim MyScrollView As Object 'the scrollview present in every tab, parent of all the controls in the tab174
+' Dim PanelObject As Object 'the Hbox which contains a single parameter it Is Created by DrawFiltersGui175
+' Dim SubObject As Object176
+' Dim aTabstrip As Tabstrip = TabStrip_filters_video177
+' Dim i As Integer178
+' Dim parse As Boolean = True179
+' Dim out As String180
+' Dim is_lavfi As Boolean = False181
+' i = aTabstrip.index182
+' 'Find the ParsedFilter Tab and activate it:183
+' aTabstrip.index = Global.TabIndexByName(ParsedFilter, aTabstrip)184
+' If Parsedfilter Like "customvideo*" Then185
+' out = Parse_video_filter_Custom()186
+' aTabstrip.index = i187
+' Return out188
+' Else189
+' 'Discend the Tab objects,parse them and build the commandline190
+' 'hierarchy is:191
+' 'Tabstrip -> scrollviews -> Panels -> ParameterObjects192
+' For Each MyScrollview In aTabstrip.Children193
+' If MyScrollView.tag = "lavfi" Then is_lavfi = True194
+' For Each PanelObject In MyScrollView.Children195
+' If PanelObject.name Like "*HBox" Then196
+' For Each SubObject In PanelObject.Children197
+' If Not (SubObject Is Label) Then198
+' If Not ((SubObject Is Checkbox) Or (subobject.name Like "NOPARSE*")) Then199
+' parse = True200
+' ' Stop201
xt7-player-mpv-0.20.384.tar.gz/.src/Form/NewChains.form -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/NewChains.form
Changed
201
1
2
MoveScaled(21,0,18,4.5714)3
Visible = False4
}5
+ { filters_video_order TextBox6
+ MoveScaled(1,0,18,4.5714)7
+ Visible = False8
+ }9
+ { drivers_video_order TextBox10
+ MoveScaled(40,0,18,4.5714)11
+ Visible = False12
+ }13
+ { drivers_audio_order TextBox14
+ MoveScaled(60,0,19,4.5714)15
+ Visible = False16
+ }17
{ TabStrip1 TabStrip18
MoveScaled(3,7,95,60)19
Expand = True20
21
Background = Color.TextBackground22
Arrangement = Arrange.Vertical23
}24
+ { ButtonLadspaHelper Button25
+ MoveScaled(34,49,14,4.5714)26
+ Visible = False27
+ ToolTip = ("Show a tool that helps you to compile ladspa filter parameters.\nIf you don't use ladspa, just don't push it.")28
+ Text = ("Ladspa")29
+ Picture = Picture["icon:/16/tools"]30
+ }31
{ TabStrip_filters_audio TabStrip32
MoveScaled(33,2,56,47)33
#Translate = False34
35
}36
Index = 037
}38
- { ButtonLadspaHelper Button39
- MoveScaled(34,49,14,4.5714)40
- Visible = False41
- ToolTip = ("Show a tool that helps you to compile ladspa filter parameters.\nIf you don't use ladspa, just don't push it.")42
- Text = ("Ladspa")43
- Picture = Picture["icon:/16/tools"]44
- }45
Index = 246
Text = ("Video Drivers")47
Picture = Picture["icon:/small/video"]48
49
}50
}51
{ ConfigureTabs_video TabStrip52
- MoveScaled(30,4,62,47)53
+ MoveScaled(30,2,62,47)54
Expand = True55
Arrangement = Arrange.Vertical56
Margin = True57
Padding = 458
- Count = 759
+ Count = 660
TextFont = Font["-1"]61
Index = 062
Text = ("Xv")63
64
{ PortChk2XV CheckBox65
MoveScaled(1,1,15,4.5714)66
#Translate = False67
- Tag = "adaptor="68
+ Tag = "xv-adaptor"69
Text = "Adaptor"70
}71
{ SpinBox10Xv SpinBox notifyobj72
73
}74
}75
{ TextBoxAdaptorsxv TextArea76
- MoveScaled(8,10,44,15)77
+ MoveScaled(0,8,44,15)78
Text = ("TextBox8")79
ReadOnly = True80
}81
82
Index = 183
Text = ("opengl")84
{ GLScrollView ScrollView85
- MoveScaled(2,-2,58,44)86
+ MoveScaled(2,3,58,44)87
Expand = True88
Arrangement = Arrange.Vertical89
Spacing = True90
Padding = 491
Border = False92
- { openglParseMeHBox1 HBox93
- MoveScaled(0,2,45,6)94
+ { openglParseMeHBox6 HBox95
+ MoveScaled(1,-1,45,6)96
AutoResize = True97
Padding = 898
- { CheckBox3gl2 CheckBox99
+ { CheckBox3gl5 CheckBox100
MoveScaled(1,1,17,4.5714)101
#Translate = False102
- Tag = "backend="103
+ Tag = "opengl-backend"104
Text = "backend"105
Value = CheckBox.True106
}107
- { ComboBox1gl2 ComboBox108
+ { ComboBox1gl4 ComboBox109
MoveScaled(19,1,24,4.5714)110
#Translate = False111
Expand = True112
- ReadOnly = True113
List = ["auto", "x11", "x11egl"]114
Text = "x11"115
}116
}117
+ { Separator2 Separator118
+ MoveScaled(0,6,51,1)119
+ }120
+ { openglParseMeHBox2 HBox121
+ MoveScaled(0,8,45,6)122
+ AutoResize = True123
+ Padding = 8124
+ { Button2 Button125
+ MoveScaled(1,1,20,4)126
+ Text = ("Apply HQ profile")127
+ }128
+ }129
{ openglParseMeHBox10 HBox130
- MoveScaled(0,9,45,6)131
+ MoveScaled(0,14,45,6)132
AutoResize = True133
Padding = 8134
{ CheckBox3gl CheckBox135
MoveScaled(1,1,17,4.5714)136
#Translate = False137
- Tag = "scale="138
+ Tag = "scale"139
Text = "scale"140
}141
{ ComboBox1gl ComboBox142
MoveScaled(19,1,24,4.5714)143
#Translate = False144
Expand = True145
- ReadOnly = True146
- List = ["bilinear", "spline36", "lanczos", "ewa_lanczos", "mitchell"]147
+ List = ["bilinear", "bicubic_fast", "oversample", "spline16", "spline36", "spline64", "sinc", "lanczos", "ginseng", "jinc", "ewa_lanczos", "ewa_hanning", "ewa_ginseng", "ewa_lanczossharp", "ewa_lanczossoft", "haasnsoft", "bicubic", "bcspline", "catmull_rom", "mitchell", "robidoux", "robidouxsharp", "ewa_robidoux", "ewa_robidouxsharp", "box", "nearest", "triangle", "gaussian"]148
Text = "bilinear"149
}150
}151
- { openglParseMeHBox2 HBox152
- MoveScaled(0,15,45,6)153
+ { openglParseMeHBox5 HBox154
+ MoveScaled(0,20,45,6)155
+ AutoResize = True156
+ Padding = 8157
+ { CheckBox3gl4 CheckBox158
+ MoveScaled(1,1,17,4.5714)159
+ #Translate = False160
+ Tag = "cscale"161
+ Text = "cscale"162
+ }163
+ { ComboBox1gl3 ComboBox164
+ MoveScaled(19,1,24,4.5714)165
+ #Translate = False166
+ Expand = True167
+ List = ["bilinear", "bicubic_fast", "oversample", "spline16", "spline36", "spline64", "sinc", "lanczos", "ginseng", "jinc", "ewa_lanczos", "ewa_hanning", "ewa_ginseng", "ewa_lanczossharp", "ewa_lanczossoft", "haasnsoft", "bicubic", "bcspline", "catmull_rom", "mitchell", "robidoux", "robidouxsharp", "ewa_robidoux", "ewa_robidouxsharp", "box", "nearest", "triangle", "gaussian"]168
+ Text = "bilinear"169
+ }170
+ }171
+ { openglParseMeHBox9 HBox172
+ MoveScaled(0,26,45,6)173
+ AutoResize = True174
+ Padding = 8175
+ { CheckBox3gl6 CheckBox176
+ MoveScaled(1,1,17,4.5714)177
+ #Translate = False178
+ Tag = "dscale"179
+ Text = "dscale"180
+ }181
+ { ComboBox1gl5 ComboBox182
+ MoveScaled(19,1,24,4.5714)183
+ #Translate = False184
+ Expand = True185
+ List = ["bilinear", "bicubic_fast", "oversample", "spline16", "spline36", "spline64", "sinc", "lanczos", "ginseng", "jinc", "ewa_lanczos", "ewa_hanning", "ewa_ginseng", "ewa_lanczossharp", "ewa_lanczossoft", "haasnsoft", "bicubic", "bcspline", "catmull_rom", "mitchell", "robidoux", "robidouxsharp", "ewa_robidoux", "ewa_robidouxsharp", "box", "nearest", "triangle", "gaussian"]186
+ Text = "bilinear"187
+ }188
+ }189
+ { openglParseMeHBox1 HBox190
+ MoveScaled(0,32,45,6)191
+ AutoResize = True192
+ Padding = 8193
+ { CheckBox3gl2 CheckBox194
+ MoveScaled(1,1,17,4.5714)195
+ #Translate = False196
+ Tag = "dither-depth"197
+ Text = "dither depth"198
+ }199
+ { ComboBox1gl2 ComboBox200
+ MoveScaled(19,1,24,4.5714)201
xt7-player-mpv-0.20.384.tar.gz/.src/Form/SubAndOsd.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/SubAndOsd.class
Changed
64
1
2
AssForceStyle = AssForceStyle & FontName3
AssForceStyle = AssForceStyle & ",FontSize=" & CStr(FontString.Font.Size)4
'If FontString.Font.Bold Then AssForceStyle = AssForceStyle & ",Bold=1"5
- If FontString.Font.Bold Then opts.push(o("sub-text-bold", "yes"))6
+ If FontString.Font.Bold Then opts.push(o("sub-bold", "yes"))7
If FontString.Font.Italic Then AssForceStyle = AssForceStyle & ",Italic=1" 8
9
SubFontName = FontString.Font.name10
'If FontString.Font.Bold Then SubFontName &= ":style=bold" 'fixmempv: how to do italic and strikeout?11
- opts.Push(o("sub-text-font", "\"" & SubFontName & "\""))12
- opts.Push(o("sub-text-font-size", CStr(FontString.Font.size)))13
+ opts.Push(o("sub-font", "\"" & SubFontName & "\""))14
+ opts.Push(o("sub-font-size", CStr(FontString.Font.size)))15
16
Endif17
18
19
AssForceStyle = AssForceStyle & Outline20
AssForceStyle = AssForceStyle & ",OutlineColour=" & rgba2Habgr(Hex(BorderColorBox.value, 6) & Hex(BorderColorSpinBox.value, 2))21
22
- opts.Add(o("sub-text-border-size", OutLineSpinBox.value))23
- opts.Add(o("sub-text-border-color", "#" & Hex(255 - BorderColorSpinBox.value, 2) & Hex(bordercolorBox.value, 6)))24
+ opts.Add(o("sub-border-size", OutLineSpinBox.value))25
+ opts.Add(o("sub-border-color", "#" & Hex(255 - BorderColorSpinBox.value, 2) & Hex(bordercolorBox.value, 6)))26
Endif27
28
'maybe redoundant with -ass-color and -ass-border-color, but do it anyway:29
If FontColorCHK.value Then 30
AssForceStyle = AssForceStyle & ",PrimaryColour=" & rgba2Habgr(Hex(FontColorBox.value, 6) & Hex(FontColorSpinBox.value, 2))31
- opts.Add(o("sub-text-color", "#" & Hex(255 - FontColorSpinBox.value, 2) & Hex(FontColorBox.value, 6)))32
+ opts.Add(o("sub-color", "#" & Hex(255 - FontColorSpinBox.value, 2) & Hex(FontColorBox.value, 6)))33
Endif34
35
If SHADOWCHK.value Then36
AssForceStyle = AssForceStyle & Shadow37
Assforcestyle = AssForceStyle & ",BackColour=" & rgba2Habgr(Hex(ShadowColorBTN.value, 6) & Hex(ShadowColorSpinBox.value, 2))38
39
- opts.Add(o("sub-text-shadow-offset", ShadowSpinBox.value))40
- opts.Add(o("sub-text-shadow-color", "#" & Hex(255 - ShadowColorSpinBox.value, 2) & Hex(ShadowColorBTN.value, 6)))41
+ opts.Add(o("sub-shadow-offset", ShadowSpinBox.value))42
+ opts.Add(o("sub-shadow-color", "#" & Hex(255 - ShadowColorSpinBox.value, 2) & Hex(ShadowColorBTN.value, 6)))43
Endif44
45
If MarginVCHK.value Then 46
47
'push SSA options48
If Not ASSDisableCHK.value = True Then 'if the user has not disabled ass rendering,49
If assoverridechk.value = True Then 'if the user choose to override ass styles,50
- opts.Add(o("ass-force-style", AssForceStyle))51
+ opts.Add(o("sub-ass-force-style", AssForceStyle))52
Endif53
Endif54
55
56
If (Lower(file.Ext((fullpath))) = "mkv") Then57
opts.Add(o("sub-file", "'" & SConv(fullpath) & "'"))58
'opts.Add(o("sub-ass", "no")) 'deprecated, use the following instead:59
- opts.Add(o("ass-style-override", "strip"))60
+ opts.Add(o("sub-ass-style-override", "strip"))61
opts.Add(o("embeddedfonts", "no"))62
Endif63
Endif64
xt7-player-mpv-0.20.384.tar.gz/.src/Form/zzzFake.class -> xt7-player-mpv-0.21.384.tar.gz/.src/Form/zzzFake.class
Changed
15
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
7
Try global.arg_file = Args.end()[0]8
+9
+ Try global.arg_debug = global.arg_debug Or Application.Env["XT7_DEBUG"] = "1"10
+ If global.arg_file = "" Then Try global.arg_file = Application.Env["XT7_FILE"] 11
+12
13
If (global.arg_file <> "") And Left(global.arg_file) <> "/" Then14
'convert relative to absolute path15
xt7-player-mpv-0.20.384.tar.gz/AA_ToDo -> xt7-player-mpv-0.21.384.tar.gz/AA_ToDo
Changed
33
1
2
+vo, ao: disable positional parameter suboptions3
+all VOs and AOs: deprecate sub-options, add them as global options4
+[opengl-hq]5
+scale=spline366
+cscale=spline367
+dscale=mitchell8
+dither-depth=auto9
+correct-downscaling=yes10
+sigmoid-upscaling=yes11
+deband=yes12
+13
+opzioni aggiuntive opengl?14
+hq preset opengl?15
+custom audio/custom video?16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
- Glitches in video area if X11 driver is used and the form is resized31
- move colorkey to video output options32
- dimensione dei sottotitoli consistente tra le diverse risoluzioni33
xt7-player-mpv-0.20.384.tar.gz/README.md -> xt7-player-mpv-0.21.384.tar.gz/README.md
Changed
35
1
2
Mandatory requirements:3
======4
* Gambas 3 (usually the very latest version)5
- * Qt46
+ * Qt5 (it is still possible to use Qt4 with little effort)7
* mpv8
9
10
11
http://rg3.github.com/youtube-dl/12
13
14
+Qt4 or Qt5?15
+======16
+xt7-player works with qt4 and qt5,17
+but will defaults to qt5 for any release past 0.20.384,18
+but build it for Qt4 toolkit is still possible:19
+Just open .project file and change the following lines:20
+```21
+ Component=gb.qt522
+ Component=gb.qt5.ext23
+```24
+to:25
+```26
+ Component=gb.qt427
+ Component=gb.qt4.ext28
+```29
+ 30
+Then build as follows:31
+32
33
Compiling it:34
======35
xt7-player-mpv-0.21.384.tar.gz/_lua_killer.lua
Added
13
1
2
+3
+pid=###4
+5
+timer = mp.add_periodic_timer(3, function()6
+ 7
+ if os.execute( "cd /proc/" .. pid) == nil then8
+ mp.command("quit")9
+ end10
+11
+end)12
\ No newline at end of file13
xt7-player-mpv-0.21.384.tar.gz/_mpvstats.lua
Added
201
1
2
+-- Display some stats.3
+--4
+-- Please consult the readme for information about usage and configuration:5
+-- https://github.com/Argon-/mpv-stats6
+--7
+-- Please note: not every property is always available and therefore not always8
+-- visible.9
+10
+local mp = require 'mp'11
+local options = require 'mp.options'12
+13
+-- Options14
+local o = {15
+ -- Default key bindings16
+ key_oneshot = "i",17
+ key_toggle = "I",18
+19
+ duration = 3,20
+ redraw_delay = 1, -- acts as duration in the toggling case21
+ ass_formatting = true,22
+ timing_warning = true,23
+ timing_warning_th = 0.85, -- *no* warning threshold (warning when > target_fps * timing_warning_th)24
+ print_perfdata_total = false, -- prints an additional line adding up the perfdata lines25
+ debug = false,26
+27
+ -- Graph options and style28
+ plot_perfdata = true,29
+ plot_vsync_ratio = true,30
+ plot_vsync_jitter = true,31
+ skip_frames = 5,32
+ global_max = true,33
+ flush_graph_data = true, -- clear data buffers when toggling34
+ plot_bg_border_color = "0000FF",35
+ plot_bg_color = "262626",36
+ plot_color = "FFFFFF",37
+38
+ -- Text style39
+ font = "Source Sans Pro",40
+ font_mono = "Source Sans Pro", -- monospaced digits are sufficient41
+ font_size = 7,42
+ font_color = "FFFFFF",43
+ border_size = 0.8,44
+ border_color = "262626",45
+ shadow_x_offset = 0.0,46
+ shadow_y_offset = 0.0,47
+ shadow_color = "000000",48
+ alpha = "11",49
+50
+ -- Custom header for ASS tags to style the text output.51
+ -- Specifying this will ignore the text style values above and just52
+ -- use this string instead.53
+ custom_header = "",54
+55
+ -- Text formatting56
+ -- With ASS57
+ nl = "\\N",58
+ indent = "\\h\\h\\h\\h\\h",59
+ prefix_sep = "\\h\\h",60
+ b1 = "{\\b1}",61
+ b0 = "{\\b0}",62
+ -- Without ASS63
+ no_ass_nl = "\n",64
+ no_ass_indent = "\t",65
+ no_ass_prefix_sep = " ",66
+ no_ass_b1 = "\027[1m",67
+ no_ass_b0 = "\027[0m",68
+}69
+options.read_options(o)70
+71
+local format = string.format72
+local max = math.max73
+-- Function used to record performance data74
+local recorder = nil75
+-- Timer used for toggling76
+local timer = nil77
+-- Save these sequences locally as we'll need them a lot78
+local ass_start = mp.get_property_osd("osd-ass-cc/0")79
+local ass_stop = mp.get_property_osd("osd-ass-cc/1")80
+81
+-- Ring buffers for the values used to construct a graph.82
+-- .pos denotes the current position, .len the buffer length83
+-- .max is the max value in the corresponding buffer as computed in record_data().84
+-- `plast_buf` is a table of buffers for the "last" value of performance data85
+-- for render/present/upload.86
+local plast_buf, vsratio_buf, vsjitter_buf87
+local function init_buffers()88
+ plast_buf = {{0, max = 0}, {0, max = 0}, {0, max = 0}, pos = 1, len = 50}89
+ vsratio_buf = {0, pos = 1, len = 50, max = 0}90
+ vsjitter_buf = {0, pos = 1, len = 50, max = 0}91
+end92
+93
+94
+local function set_ASS(b)95
+ if not o.ass_formatting then96
+ return ""97
+ end98
+ return b and ass_start or ass_stop99
+end100
+101
+102
+local function no_ASS(t)103
+ return set_ASS(false) .. t .. set_ASS(true)104
+end105
+106
+107
+local function b(t)108
+ return o.b1 .. t .. o.b0109
+end110
+111
+112
+local function text_style()113
+ if not o.ass_formatting then114
+ return ""115
+ end116
+ if o.custom_header and o.custom_header ~= "" then117
+ return set_ASS(true) .. o.custom_header118
+ else119
+ return format("%s{\\fs%d}{\\fn%s}{\\bord%f}{\\3c&H%s&}{\\1c&H%s&}{\\alpha&H%s&}{\\xshad%f}{\\yshad%f}{\\4c&H%s&}",120
+ set_ASS(true), o.font_size, o.font, o.border_size,121
+ o.border_color, o.font_color, o.alpha, o.shadow_x_offset,122
+ o.shadow_y_offset, o.shadow_color)123
+ end124
+end125
+126
+127
+local function has_vo_window()128
+ return mp.get_property("vo-configured") == "yes"129
+end130
+131
+132
+local function has_video()133
+ local r = mp.get_property("video")134
+ return r and r ~= "no" and r ~= ""135
+end136
+137
+138
+local function has_audio()139
+ local r = mp.get_property("audio")140
+ return r and r ~= "no" and r ~= ""141
+end142
+143
+144
+local function has_ansi()145
+ local is_windows = type(package) == 'table' and type(package.config) == 'string' and package.config:sub(1,1) == '\\'146
+ if is_windows then147
+ return os.getenv("ANSICON")148
+ end149
+ return true150
+end151
+152
+153
+-- Generate a graph from the given values.154
+-- Returns an ASS formatted vector drawing as string.155
+--156
+-- values: Array/Table of numbers representing the data. Used like a ring buffer157
+-- it will get iterated backwards `len` times starting at position `i`.158
+-- i : Index of the latest data value in `values`.159
+-- len : The length/amount of numbers in `values`.160
+-- v_max : The maximum number in `values`. It is used to scale all data161
+-- values to a range of 0 to `v_max`.162
+-- scale : A value that will be multiplied with all data values.163
+local function generate_graph(values, i, len, v_max, scale)164
+ -- Check if at least one value exists165
+ if not values[i] then166
+ return ""167
+ end168
+169
+ local x_tics = 1170
+ local x_max = (len - 1) * x_tics171
+ local y_offset = o.border_size172
+ local y_max = o.font_size * 0.66173
+ local x = 0174
+175
+ local s = {format("m 0 0 n %f %f l ", x, y_max - (y_max * values[i] / v_max * scale))}176
+ i = ((i - 2) % len) + 1177
+178
+ for p = 1, len - 1 do179
+ if values[i] then180
+ x = x - x_tics181
+ s[#s+1] = format("%f %f ", x, y_max - (y_max * values[i] / v_max * scale))182
+ end183
+ i = ((i - 2) % len) + 1184
+ end185
+186
+ s[#s+1] = format("%f %f %f %f", x, y_max, 0, y_max)187
+188
+ local bg_box = format("{\\bord0.5}{\\3c&H%s&}{\\1c&H%s&}m 0 %f l %f %f %f 0 0 0",189
+ o.plot_bg_border_color, o.plot_bg_color, y_max, x_max, y_max, x_max)190
+ return format("%s{\\r}{\\pbo%f}{\\shad0}{\\alpha&H00}{\\p1}%s{\\p0}{\\bord0}{\\1c&H%s}{\\p1}%s{\\p0}{\\r}%s",191
+ o.prefix_sep, y_offset, bg_box, o.plot_color, table.concat(s), text_style())192
+end193
+194
+195
+-- Format and append a property.196
+-- A property whose value is either `nil` or empty (hereafter called "invalid")197
+-- is skipped and not appended.198
+-- Returns `false` in case nothing was appended, otherwise `true`.199
+--200
+-- s : Table containing strings.201
xt7-player-mpv-0.21.384.tar.gz/audio-input-microphone.png
Added
xt7-player-mpv-0.20.384.tar.gz/shade_alpha.png -> xt7-player-mpv-0.21.384.tar.gz/shade_alpha.png
Changed