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 4
xt7-player-mpv.changes
Changed
x
1
2
-------------------------------------------------------------------
3
+Sun Nov 8 20:53:25 UTC 2015 - avvissu@yandex.ru
4
+
5
+- Update to 0.12.381:
6
+ * see: /usr/share/doc/packages/xt7-player-mpv/CHANGELOG_GIT
7
+
8
+-------------------------------------------------------------------
9
Sat Oct 31 13:06:26 UTC 2015 - avvissu@yandex.ru
10
11
- Add gambas3-gb-libxml instead of gb-xml
12
xt7-player-mpv.spec
Changed
30
1
2
3
4
Name: xt7-player-mpv
5
-Version: 0.11.381
6
+Version: 0.12.381
7
Release: 0
8
Summary: Qt/Gambas gui to mpv
9
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.gz
13
BuildRequires: desktop-file-utils
14
-BuildRequires: gambas3-devel >= 3.6.2
15
+BuildRequires: gambas3-devel >= 3.8.1
16
BuildRequires: gambas3-gb-args
17
BuildRequires: gambas3-gb-compress
18
BuildRequires: gambas3-gb-db
19
20
Requires: gambas3-gb-util-web
21
Requires: gambas3-gb-web
22
Requires: gambas3-gb-libxml
23
-Requires: gambas3-runtime >= 3.6.2
24
-Requires: mpv >= 0.11.0
25
+Requires: gambas3-runtime >= 3.8.1
26
+Requires: mpv >= 0.12.0
27
Requires: wget
28
Requires: youtube-dl
29
Recommends: dvb
30
xt7-player-mpv-0.11.381.tar.gz/.lang/it.mo -> xt7-player-mpv-0.12.381.tar.gz/.lang/it.mo
Changed
xt7-player-mpv-0.11.381.tar.gz/.lang/it.po -> xt7-player-mpv-0.12.381.tar.gz/.lang/it.po
Changed
201
1
2
msgid ""
3
msgstr ""
4
"Project-Id-Version: xt7-player-mpv 3.8.1\n"
5
-"PO-Revision-Date: 2015-09-11 15:13 UTC\n"
6
+"PO-Revision-Date: 2015-11-06 12:27 UTC\n"
7
"Last-Translator: kokoko3k <kokoko3k@gmail.com>\n"
8
"Language: it\n"
9
"MIME-Version: 1.0\n"
10
11
msgid "Click for a list of URI prefixes"
12
msgstr "Mostra la lista dei prefissi per le URI"
13
14
-#: AddUriForm.form:51 FMain.class:8431
15
+#: AddUriForm.form:51 FMain.class:8588
16
msgid "cdda://"
17
msgstr "-"
18
19
20
msgid "Add the selected URI to Collection and/or Playlist"
21
msgstr "Aggiungi l'URI selezionata alla collezione/playlist"
22
23
-#: AddUriForm.form:152 FMain.class:8917 GeneralOptions.form:957
24
+#: AddUriForm.form:152 FMain.class:9074 GeneralOptions.form:1008
25
msgid "Add"
26
msgstr "Aggiungi"
27
28
-#: ladspahelper.form:136
29
+#: ladspahelper.form:170
30
msgid "Close"
31
msgstr "Chiudi"
32
33
-#: AlbumView.class:92 FMain.class:1268
34
+#: AlbumView.class:92 FMain.class:1319
35
msgid "Unknown"
36
msgstr "Sconosciuto"
37
38
39
msgid "Title"
40
msgstr "Titolo"
41
42
-#: AudioConvert.class:94 FMain.class:9399
43
+#: AudioConvert.class:94 FMain.class:9560
44
msgid "Unable to get the real stream url"
45
msgstr "Non posso recuperare l'url reale del flusso"
46
47
48
msgid "Media Info "
49
msgstr "Media Info"
50
51
-#: AudioForm.form:188 FMain.form:677 FormLyrics.form:90 Searchfields.form:58
52
+#: AudioForm.form:188 FMain.form:690 FormLyrics.form:90 Searchfields.form:58
53
msgid "Artist"
54
msgstr "Artista"
55
56
-#: AudioForm.form:199 FMain.form:673 Searchfields.form:66
57
+#: AudioForm.form:199 FMain.form:686 Searchfields.form:66
58
msgid "Album"
59
msgstr "Album"
60
61
-#: AudioForm.form:210 FMain.form:2614 Searchfields.form:90
62
+#: AudioForm.form:210 FMain.form:2672 Searchfields.form:90
63
msgid "Year"
64
msgstr "Anno"
65
66
-#: AudioForm.form:232 FMain.form:2682 Searchfields.form:119
67
+#: AudioForm.form:232 FMain.form:2740 Searchfields.form:119
68
msgid "Comment"
69
msgstr "Commento"
70
71
72
msgid "Lyrics"
73
msgstr "Testi"
74
75
-#: AudioForm.form:355 FMain.form:2158
76
+#: AudioForm.form:355 FMain.form:2208
77
msgid "Radio"
78
msgstr "Radio"
79
80
-#: ShoutCastClass.class:149
81
+#: ShoutCastClass.class:223
82
msgid "Name"
83
msgstr "Nome"
84
85
-#: AudioForm.form:375 FMain.class:8420 Searchfields.form:104
86
+#: AudioForm.form:375 FMain.class:8577 Searchfields.form:104
87
msgid "Length"
88
msgstr "Durata"
89
90
91
msgid ":"
92
msgstr "-"
93
94
-#: ChooseAspect.form:53 GeneralOptions.form:2151
95
+#: ChooseAspect.form:53 GeneralOptions.form:2202
96
msgid "="
97
msgstr "-"
98
99
100
msgid "1.7778"
101
msgstr "-"
102
103
-#: ChooseAspect.form:64 ladspahelper.form:128
104
+#: ChooseAspect.form:64
105
msgid "Test"
106
msgstr "Test"
107
108
109
msgid "ShutDown CountDown..."
110
msgstr "Conto alla rovescia per lo spegnimento."
111
112
-#: CountDown.form:17 NewChains.class:427
113
+#: CountDown.form:17 NewChains.class:446
114
msgid "Abort"
115
msgstr "Annulla"
116
117
118
msgid "Try to use less strict terms, remove symbols and so on..."
119
msgstr "Prova ad usare termini meno stretti, rimuovi i simboli e così via..."
120
121
-#: CoverManager.class:909
122
+#: CoverManager.class:913
123
msgid "Load a Jpg cover image"
124
msgstr "Carica una copertina in formato jpg"
125
126
-#: CoverManager.class:925
127
+#: CoverManager.class:929
128
msgid "Error while loading the picture"
129
msgstr "Errore durante il caricamento dell' immagine"
130
131
-#: CoverManager.class:957 FMain.class:7325
132
+#: CoverManager.class:961 FMain.class:7447
133
msgid "\nso you are going to set a cover for this particular file/stream"
134
msgstr "\nQuindi la copertina che imposterai sarà solo per questo file o stream"
135
136
-#: CoverManager.class:958 FMain.class:7326
137
+#: CoverManager.class:962 FMain.class:7448
138
msgid "Artist Or Album tag information are required to set a cover"
139
msgstr "Le tag artista o album sono necessarie per impostare una copertina"
140
141
142
msgid "Load cover"
143
msgstr "Carica da disco"
144
145
-#: CoverManager.form:178 GeneralOptions.form:2524
146
+#: CoverManager.form:178 GeneralOptions.form:2575
147
msgid "128"
148
msgstr "-"
149
150
-#: CoverManager.form:178 GeneralOptions.form:2524
151
+#: CoverManager.form:178 GeneralOptions.form:2575
152
msgid "160"
153
msgstr "-"
154
155
156
msgid "Set Cover"
157
msgstr "Imposta"
158
159
-#: DVBTuner.class:53 FMain.form:1713 GeneralOptions.form:1535
160
+#: DVBTuner.class:53 FMain.form:1762 GeneralOptions.form:1586
161
msgid "DVB-T"
162
msgstr "-"
163
164
165
msgid "Too bad..."
166
msgstr "Peccato..."
167
168
-#: DVBTuner.form:34 FMain.form:899
169
+#: DVBTuner.form:34 FMain.form:912
170
msgid "Simple Dvb-T Tuner"
171
msgstr "Semplice tuner DVB-T"
172
173
174
msgid "Import"
175
msgstr "Importa"
176
177
-#: DVBTuner.form:90 GeneralOptions.form:1724
178
+#: DVBTuner.form:90 GeneralOptions.form:1775
179
msgid "Card #"
180
msgstr "Scheda #"
181
182
-#: DVBTuner.form:108 EpgForm.form:332 FMain.form:2859
183
+#: DVBTuner.form:108 EpgForm.form:332 FMain.form:2905
184
msgid "Stop"
185
msgstr "Stop"
186
187
188
msgid "Scan All"
189
msgstr "Aggiorna tutto"
190
191
-#: FMain.class:599
192
+#: FMain.class:625
193
msgid "Couldn't clear the history!"
194
msgstr "Impossibile cancellare la cronologia!"
195
196
-#: FMain.class:1273
197
-msgid " channels"
198
-msgstr "canali"
199
+#: FMain.class:1324 Searchfields.form:161
200
+msgid "Channels"
201
xt7-player-mpv-0.11.381.tar.gz/.lang/ru.mo -> xt7-player-mpv-0.12.381.tar.gz/.lang/ru.mo
Changed
xt7-player-mpv-0.11.381.tar.gz/.lang/ru.po -> xt7-player-mpv-0.12.381.tar.gz/.lang/ru.po
Changed
201
1
2
#, fuzzy
3
msgid ""
4
msgstr ""
5
-"Project-Id-Version: PACKAGE VERSION\n"
6
-"POT-Creation-Date: 2002-11-01 04:27+0100\n"
7
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
8
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
9
-"Language-Team: LANGUAGE <LL@li.org>\n"
10
-"Language: \n"
11
+"Project-Id-Version: xt7-player-mpv 3.8.1\n"
12
+"POT-Creation-Date: 2015-10-07 11:44 UTC\n"
13
+"PO-Revision-Date: 2015-10-07 11:24 UTC\n"
14
+"Last-Translator: kokoko3k <kokoko3k@gmail.com>\n"
15
+"Language: ru\n"
16
"MIME-Version: 1.0\n"
17
"Content-Type: text/plain; charset=UTF-8\n"
18
"Content-Transfer-Encoding: 8bit\n"
19
20
msgstr "-"
21
22
#: .project:2
23
-msgid "Xt7-Player, an (almost) complete mplayer gui"
24
-msgstr "Xt7-Player, полнофункциональный (почти) графический интерфейс к mplayer"
25
-
26
-#: AFiltersCfg.class:114
27
-msgid "Method"
28
-msgstr "Метод"
29
-
30
-#: AFiltersCfg.class:115
31
-msgid "Target"
32
-msgstr "Цель"
33
-
34
-#: AFiltersCfg.class:120
35
-msgid "Amount"
36
-msgstr "Объем"
37
-
38
-#: AFiltersCfg.class:125
39
-msgid "Channel 1"
40
-msgstr "Канал 1"
41
-
42
-#: AFiltersCfg.class:126
43
-msgid "Channel 2"
44
-msgstr "Канал 2"
45
-
46
-#: AFiltersCfg.class:127
47
-msgid "Channel 3"
48
-msgstr "Канал 3"
49
-
50
-#: AFiltersCfg.class:128
51
-msgid "Channel 4"
52
-msgstr "Канал 4"
53
-
54
-#: AFiltersCfg.class:129
55
-msgid "Channel 5"
56
-msgstr "Канал 5"
57
-
58
-#: AFiltersCfg.class:130
59
-msgid "Channel 6"
60
-msgstr "Канал 6"
61
-
62
-#: AFiltersCfg.class:141
63
-msgid "1 Turns on soft clipping"
64
-msgstr "1 включает программную обрезку"
65
-
66
-#: AFiltersCfg.class:141
67
-msgid "Soft Clipping"
68
-msgstr "Программная обрезка"
69
-
70
-#: AFiltersCfg.class:152
71
-msgid "Runtime responce to speed change"
72
-msgstr "Время отклика на изменение скорости"
73
-
74
-#: AFiltersCfg.class:162
75
-msgid "Custom audio filter(s):"
76
-msgstr "Пользовательский аудио фильтр(ы):"
77
-
78
-#: AFiltersCfg.class:162
79
-msgid "E.g.:resample=44100:1:2,hrtf=s"
80
-msgstr "Например:resample=44100:1:2,hrtf=s"
81
-
82
-#: AFiltersCfg.class:413 AudioVideoCodecs.class:72 Chains.class:309
83
-#: GeneralOptions.class:878 HotKeys.class:526 SubAndOsd.class:346
84
-#: VFiltersCfg.class:568 VideoEqualizer.class:45
85
-#: XConfigureAudioDriver.class:228 XConfigureVideoDriver.class:251
86
-msgid "Don't"
87
-msgstr "Нет"
88
-
89
-#: AFiltersCfg.class:413 AudioVideoCodecs.class:72 Chains.class:309
90
-#: GeneralOptions.class:878 HotKeys.class:526 SubAndOsd.class:346
91
-#: VFiltersCfg.class:568 VideoEqualizer.class:45
92
-#: XConfigureAudioDriver.class:228 XConfigureVideoDriver.class:251
93
-msgid "Proceed"
94
-msgstr "Продолжить"
95
-
96
-#: AFiltersCfg.class:413 AudioVideoCodecs.class:72 Chains.class:309
97
-#: GeneralOptions.class:878 HotKeys.class:526 SubAndOsd.class:346
98
-#: VFiltersCfg.class:568 VideoEqualizer.class:45
99
-#: XConfigureAudioDriver.class:228 XConfigureVideoDriver.class:251
100
-msgid ""
101
-"This will save this window settings\n"
102
-" to all profiles found but the 'Factory_defaults' one"
103
-msgstr ""
104
-"Это позволяет сохранять в этом окне настройки\n"
105
-" ко всем найденным профилям, кроме 'Factory_defaults' (заводские)"
106
-
107
-#: AFiltersCfg.class:584 CountDown.form:17
108
-msgid "Abort"
109
-msgstr "Прервать"
110
-
111
-#: AFiltersCfg.class:584
112
-msgid "Continue anyway"
113
-msgstr "Продолжить в любом случае"
114
-
115
-#: AFiltersCfg.class:584
116
-msgid ""
117
-"Even if your mplayer has ladspa support compiled in,\n"
118
-"you seem to miss the ladspa package.\n"
119
-"because 'analyseplugin' executable is not found"
120
-msgstr ""
121
-"Даже если ваш mplayer поддерживает ladspa,\n"
122
-"вы кажется пропустили пакет ladspa.\n"
123
-"потому что не найден исполняемый 'analyseplugin'"
124
-
125
-#: AFiltersCfg.form:64
126
-msgid "Audio Filters configuration"
127
-msgstr "Конфигурация аудио фильтров"
128
-
129
-#: AFiltersCfg.form:72 AudioVideoCodecs.form:42 Chains.form:78 FMain.form:938
130
-#: GeneralOptions.form:345 HotKeys.form:34 SubAndOsd.form:99
131
-#: VFiltersCfg.form:31 VideoEqualizer.form:52 XConfigureAudioDriver.form:84
132
-#: XConfigureVideoDriver.form:190
133
-msgid "Profile"
134
-msgstr "Профиль"
135
-
136
-#: AFiltersCfg.form:75 AudioVideoCodecs.form:45 Chains.form:81 FMain.form:942
137
-#: GeneralOptions.form:348 HotKeys.form:37 SubAndOsd.form:102
138
-#: VFiltersCfg.form:34 VideoEqualizer.form:55 XConfigureAudioDriver.form:87
139
-#: XConfigureVideoDriver.form:193
140
-msgid "Reload current profile"
141
-msgstr "Перезагрузить текущий профиль"
142
-
143
-#: AFiltersCfg.form:80 AudioVideoCodecs.form:50 Chains.form:86
144
-#: GeneralOptions.form:353 HotKeys.form:42 SubAndOsd.form:107
145
-#: VFiltersCfg.form:39 VideoEqualizer.form:60 XConfigureAudioDriver.form:92
146
-#: XConfigureVideoDriver.form:198
147
-msgid "Save to current profile"
148
-msgstr "Сохранить в текущий профиль"
149
-
150
-#: AFiltersCfg.form:85 AudioVideoCodecs.form:55 GeneralOptions.form:358
151
-#: HotKeys.form:47 SubAndOsd.form:112 VFiltersCfg.form:44
152
-#: VideoEqualizer.form:65 XConfigureAudioDriver.form:97
153
-#: XConfigureVideoDriver.form:203
154
-msgid "Save these settings to all profiles"
155
-msgstr "Сохранить эти параметры во все профили"
156
-
157
-#: AFiltersCfg.form:102
158
-msgid "Audio Filters list"
159
-msgstr "Список аудио фильтров"
160
-
161
-#: AFiltersCfg.form:109
162
-msgid "equalizer"
163
-msgstr "-"
164
-
165
-#: AFiltersCfg.form:145
166
-msgid "31"
167
-msgstr "-"
168
-
169
-#: AFiltersCfg.form:150
170
-msgid "62"
171
-msgstr "-"
172
-
173
-#: AFiltersCfg.form:155
174
-msgid "125"
175
-msgstr "-"
176
-
177
-#: AFiltersCfg.form:160
178
-msgid "250"
179
-msgstr "-"
180
-
181
-#: AFiltersCfg.form:165
182
-msgid "500"
183
-msgstr "-"
184
-
185
-#: AFiltersCfg.form:170
186
-msgid "1K"
187
-msgstr "-"
188
-
189
-#: AFiltersCfg.form:175
190
-msgid "2K"
191
-msgstr "-"
192
-
193
-#: AFiltersCfg.form:180
194
-msgid "4K"
195
-msgstr "-"
196
-
197
-#: AFiltersCfg.form:185
198
-msgid "8K"
199
-msgstr "-"
200
-
201
xt7-player-mpv-0.11.381.tar.gz/.project -> xt7-player-mpv-0.12.381.tar.gz/.project
Changed
9
1
2
Component=gb.settings
3
Component=gb.form.mdi
4
Component=gb.form.stock
5
+Component=gb.gui.trayicon
6
Component=gb.libxml
7
Component=gb.net
8
Component=gb.net.curl
9
xt7-player-mpv-0.11.381.tar.gz/.settings -> xt7-player-mpv-0.12.381.tar.gz/.settings
Changed
92
1
2
+[Bookmarks]
3
+FMain=[7640]
4
+
5
[Breakpoints]
6
Count=0
7
8
9
[DebugWindow/Settings]
10
Geometry=[539,0,422,351]
11
12
+[DebugWindow/ShutMEDIA]
13
+Geometry=[1280,0,224,280]
14
+
15
+[DebugWindow/ShutOFF]
16
+Geometry=[1280,0,224,280]
17
+
18
+[DebugWindow/ShutPLS]
19
+Geometry=[1280,0,224,280]
20
+
21
[DebugWindow/SidChanTable]
22
Geometry=[44,661,505,995]
23
24
25
[DebugWindow/Split(sBuf, "\n", "", True)]
26
Geometry=[1194,534,816,385]
27
28
+[DebugWindow/Split(sbuf, "\n", "", True)]
29
+Geometry=[74,418,929,429]
30
+
31
[DebugWindow/Split(sline, ":", "", TRUE)]
32
Geometry=[0,0,344,344]
33
34
35
[DebugWindow/cachebar]
36
Geometry=[713,494,470,633]
37
38
+[DebugWindow/cachedgenres]
39
+Geometry=[1280,0,224,280]
40
+
41
[DebugWindow/chain_items]
42
Geometry=[758,461,210,327]
43
44
45
[DebugWindow/covermanager.coverpicture(CoverManager.coverfile(artist, album), fullpath, rowheight)]
46
Geometry=[48,-4,210,210]
47
48
+[DebugWindow/cuelines]
49
+Geometry=[1280,0,224,280]
50
+
51
[DebugWindow/detail_jdecoded]
52
Geometry=[1170,288,256,320]
53
54
55
Geometry=[1280,-3,440,591]
56
57
[DebugWindow/names]
58
-Geometry=[44,0,210,210]
59
+Geometry=[47,0,224,280]
60
61
[DebugWindow/new_opt]
62
Geometry=[44,0,210,210]
63
64
[DebugWindow/subtitletracks]
65
Geometry=[48,-4,210,210]
66
67
+[DebugWindow/supported_domains]
68
+Geometry=[47,0,224,280]
69
+
70
[DebugWindow/tArea]
71
Geometry=[1280,0,210,745]
72
73
74
75
[OpenFile]
76
File[1]=".src/Form/FMain.form"
77
-File[2]=".src/Form/NewChains.form"
78
-File[3]=".src/Form/NewChains.class:10.484"
79
-File[4]=".src/Classi/MplayerClass.class:0.1951"
80
-Active=6
81
-File[5]=".src/0_Moduli/Global.module:3.126"
82
-Count=6
83
-File[6]=".src/Form/FMain.class:30.2053"
84
+File[2]=".src/Form/FMain.class:10.3911"
85
+Active=3
86
+Count=4
87
+File[3]=".src/Form/HotKeys.form"
88
+File[4]=".src/Form/HotKeys.class:32.16"
89
90
[Watches]
91
Count=6
92
xt7-player-mpv-0.11.381.tar.gz/.src/0_Moduli/Global.module -> xt7-player-mpv-0.12.381.tar.gz/.src/0_Moduli/Global.module
Changed
29
1
2
imgfilters = ("*.jpg;*.jpeg;*.bmp;*.png;")
3
Slowmedia = "cddb:// cdda:// mms:// http:// http_proxy:// rtp:// rtsp:// ftp:// udp:// smb:// " 'we'll get tag information on user prefs
4
NonTaggableMedia = "tv:// radio:// cdda:// cddb:// mf:// pvr:// dvb:// unsv:// sdp:// mpst:// tivo://"
5
- NetworkURI = " mms:// http:// http_proxy:// rtp:// rtsp:// ftp:// udp:// "
6
+ NetworkURI = "https:// mms:// mmst:// mmsh:// mmshttp:// hls:// httpproxy:// http:// http_proxy:// rtp:// rtmp:// rtmpe:// rtmps:// rtmpt:// rtmpte:// rtmpts:// srtp:// rtsp:// ftp:// tcp:// tls:// sftp:// udp:// ytdl://"
7
UserPlaylistsDir = ".playlists"
8
'Please terminate ALLFILTERS with ";"!
9
'ALLFilters '= Videofilter & ";" & AudioFilter & ";" & UncommonVideoFilters & ";" & UncommonAudiofilters
10
11
12
13
Public Function UriPrefix(Uri As String) As String
14
-
15
If uri Like "*://*" Then
16
'find ":" and return 2 characters more
17
Return Left(URI, InStr(URI, ":") + 2)
18
19
Endif
20
End
21
22
+Public Function isytdl(URI As String) As Boolean
23
+ Return (InStr(Lower(uri), "ytdl://") = 1)
24
+End
25
+
26
27
Public Function IsNetworkURI(URI As String) As Boolean
28
If (InStr(NetworkURI, Lower(UriPrefix(URI))) > 0) Then
29
xt7-player-mpv-0.11.381.tar.gz/.src/Classi/MplayerClass.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Classi/MplayerClass.class
Changed
201
1
2
Private Playerprocess As Process
3
Private RenicerProcess As Process
4
5
+Private Const play_initialized_str As String = "MPV_PLAY_IS_FULLY_INITIALIZED"
6
+
7
8
Private stopping As Boolean = False
9
10
11
Public osdlevel As String = ""
12
13
14
-Public Function FillMultitracks()
15
+Public Function old_FillMultitracks()
16
Dim T, Tcount As Integer
17
Dim Type As String
18
Dim id, name, lang, tmp, codec As String
19
20
tmp = (ID & " - " & NAME & " - " & LANG & " - " & CODEC)
21
Select Case Type
22
Case "audio"
23
- prop["audiotracks"].Add(Replace(tmp, "(unavailable)", "*"))
24
+ prop["audiotracks"].Add(Replace(tmp, unavailable_str, "*"))
25
' Case "video"
26
'multiple video tracks unsupported by xt7
27
Case "sub"
28
- prop["subtitletracks"].Add(Replace(tmp, "(unavailable)", "*"))
29
+ prop["subtitletracks"].Add(Replace(tmp, unavailable_str, "*"))
30
End Select
31
Next
32
33
34
setP("audioonly", (Not video_ok))
35
End
36
37
+
38
+Public Function FillMultitracks()
39
+ Dim T, Tcount As Integer
40
+ Dim Type As String
41
+ Dim id, name, lang, tmp, codec As String
42
+ Dim properties As New String[]
43
+ Dim video_ok As Boolean = False
44
+
45
+ If getP("fullpath") = "" Then Return
46
+
47
+ Try prop["audiotracks"].Clear
48
+ Try prop["subtitletracks"].Clear
49
+ Try Tcount = CInt(get_property_mpv("track-list/count"))
50
+ If Error Then
51
+ global.myDebug("WW", "unable to get track count")
52
+ Return
53
+ Endif
54
+
55
+ For T = 0 To Tcount - 1
56
+ properties.add("track-list/" & T & "/id")
57
+ properties.add("track-list/" & T & "/title")
58
+ properties.add("track-list/" & T & "/lang")
59
+ properties.add("track-list/" & T & "/type")
60
+ properties.add("track-list/" & T & "/codec")
61
+ Next 'T
62
+
63
+ properties.Add("vo-configured")
64
+ properties.Add("current-vo")
65
+
66
+ get_properties_mpv(properties)
67
+
68
+
69
+ For T = 0 To Tcount - 1
70
+ id = getP("track-list/" & T & "/id")
71
+ name = getP("track-list/" & T & "/title")
72
+ lang = getP("track-list/" & T & "/lang")
73
+ Type = getP("track-list/" & T & "/type")
74
+ codec = getP("track-list/" & T & "/codec")
75
+ tmp = (ID & " - " & NAME & " - " & LANG & " - " & CODEC)
76
+ Select Case Type
77
+ Case "audio"
78
+ prop["audiotracks"].Add(Replace(tmp, unavailable_str, "*"))
79
+ ' Case "video"
80
+ 'multiple video tracks unsupported by xt7
81
+ Case "sub"
82
+ prop["subtitletracks"].Add(Replace(tmp, unavailable_str, "*"))
83
+ End Select
84
+ Next
85
+
86
+ video_ok = getP("vo-configured") = "yes"
87
+ video_ok = video_ok And (getP("current-vo") <> "(unavailable)")
88
+
89
+ ' video_ok = (get_property_mpv("vo-configured") = "yes")
90
+ ' video_ok = video_ok And (get_property_mpv("current-vo") <> "(unavailable)")
91
+ setP("audioonly", (Not video_ok))
92
+End
93
+
94
Public Function get_length() As String
95
Return get_property_mpv("=duration")
96
End
97
98
Dim sBuf As String, question, answer As String
99
Try Read #playerprocess, sBuf, -4096
100
'global.myDebug(sbuf)
101
+ ' If sBuf Like "*playlist/0*" Then
102
+ ' Stop
103
+ ' Endif
104
+
105
If sBuf Like "ANS_*|*" Then
106
For Each sBuf In Split(sbuf, "\n", "", True)
107
question = MidC(sBuf, "_", "|")
108
109
110
Public Sub playerprocess_error(err As String)
111
stderr &= err & "\n"
112
+ If err Like "*" & play_initialized_str & "*" Then
113
+ 'catch statusline with the message player initialized
114
+ 'this hopefully means the play is initialized
115
+ set_property_mpv("options/term-status-msg", "")
116
+ setP("play_initialized", "yes")
117
+ Endif
118
End
119
120
121
122
End
123
124
Public Function waitplayback(timeoutcentisecs As Integer) As Boolean
125
- Dim cTime As Float = 0
126
+ Dim play_initialized As Boolean = False
127
+ Dim idling As Boolean
128
+ setP("idle", "no")
129
130
Repeat
131
If Not ProcessRunningOvr() Then Return False
132
- get_property_mpv("=time-pos", False)
133
Wait 0.01
134
timeoutcentisecs -= 1
135
- Try cTime = getP("=time-pos")
136
- Until (cTime > 0) Or (timeoutcentisecs <= 0)
137
- If ctime > 0 Then
138
- setP("=time-pos", Null)
139
+ If IsInteger(CStr(timeoutcentisecs / 100)) Then 'check if playback is idle (eg: no file playing) every second
140
+ global.myDebug("check if idle")
141
+ get_property_mpv("=idle", False)
142
+ Endif
143
+ play_initialized = (getP("play_initialized") = "yes")
144
+ 'play_initialized is set by playerprocess_error through the hack
145
+ 'of setting the statusline to a value recognized by playerprocess_error
146
+ 'Hopefully, when the statusline is initialized, the playback is initialized too.
147
+ 'In case of problems, the core-idle property may come handy (but slower), see:
148
+ 'https://github.com/mpv-player/mpv/commit/8d414e2fe7f79f1bbf9158e8aa034e9ac9cf2222#commitcomment-13950548
149
+ Until play_initialized Or (timeoutcentisecs <= 0) Or (getP("=idle") = "yes")
150
+ global.myDebug("timeoutcentisecs=", timeoutcentisecs)
151
+ global.myDebug("play_initialized=", play_initialized)
152
+ global.myDebug("getp_idle=", getP("=idle"))
153
+ If play_initialized Then
154
+ setP("idle", Null)
155
Return True
156
Endif
157
+ setP("idle", Null)
158
Return False
159
End
160
161
+
162
+' Public Function waitplayback(timeoutcentisecs As Integer) As Boolean
163
+' Dim cTime As Float = 0
164
+' Dim idling As Boolean
165
+' setP("idle", "no")
166
+'
167
+' Repeat
168
+' If Not ProcessRunningOvr() Then Return False
169
+' get_property_mpv("=time-pos", False)
170
+' Wait 0.01
171
+' timeoutcentisecs -= 1
172
+' Try cTime = getP("=time-pos")
173
+' If IsInteger(CStr(timeoutcentisecs / 100)) Then 'check if playback is idle (eg: no file playing) every second
174
+' get_property_mpv("=idle", False)
175
+' Endif
176
+' Until (cTime > 0) Or (timeoutcentisecs <= 0) Or (getP("=idle") = "yes")
177
+' If ctime > 0 Then
178
+' setP("=time-pos", Null)
179
+' setP("idle", Null)
180
+' Return True
181
+' Endif
182
+' setP("idle", Null)
183
+' Return False
184
+' End
185
+
186
' Public Function waitplayback(timeoutcentisecs As Integer) As Boolean
187
' Dim i As Integer
188
' Dim cTime As Float = 0
189
190
If Error Then global.myDebug("Error while trying to set: ", aKey, "=", aData)
191
End
192
193
-Public Function getP(aKey As String) As Variant
194
- 'get a lowercase property from a
195
+Public Function getP(aKey As String, Optional unanswered_string As String) As Variant
196
+ 'get a lowercase property from a key
197
+ 'if the key is not found, then return null, or return unanswered_string if specified.
198
If prop.exist(Lower(aKey)) Then Return prop[Lower(aKey)]
199
- Return Null
200
+ If unanswered_string <> Null Then
201
xt7-player-mpv-0.11.381.tar.gz/.src/Classi/PlaylistClass.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Classi/PlaylistClass.class
Changed
110
1
2
AddFile(LibraryGrid, DirToAdd & filename, Not (quickmode), False)
3
If Global.LSyncing Then fmain.WaitPanel.text = Global.LSyncingMessage & "<br>" & dirtoadd
4
Else If Stat(DirToAdd & filename, True).Type = gb.Directory Then
5
- Try AddDir(LibraryGrid, DirToAdd & filename, ExcludeList)
6
+ Try AddDir(LibraryGrid, DirToAdd & filename, ExcludeList)
7
'IF Global.LSyncing THEN fmain.WaitPanel.text = Global.LSyncingMessage & "<br>" & filename
8
Endif
9
Endif
10
11
SortTable.Add(GetValue(Ptable[i], Field))
12
Next 'i
13
' [GB2:TEXT] SortTable = SortTable.Sort(gb.text)
14
- SortTable = SortTable.Sort(gb.IgnoreCase)
15
+ SortTable = SortTable.Sort(gb.language)
16
'PRINT "Debug: playlistclass syncsorttable() end at: " & Time
17
18
'endtime = Now
19
20
21
End
22
23
-
24
Private Function BinarySearch(item As String) As Integer
25
Dim first, Tlast, middle As Integer
26
27
Dim MiddleItem As String
28
first = 0
29
Tlast = SortTable.count - 1
30
- ' IF item = "/mnt/disco2/vcast/download/Star_trek_migliori.mp4" THEN
31
- ' PRINT "break"
32
- ' ENDIF
33
+
34
+ Repeat
35
+ middle = (first + tlast) / 2
36
+ MiddleItem = SortTable[middle]
37
+ If Trim(MiddleItem) = Trim(item) Then
38
+ Return middle
39
+
40
+ ' 'gb.text is a case unsensitive comparision,
41
+ ' 'we've to manage the sensitive comparision
42
+ ' 'via a gb.binary search
43
+ Else If Trim(Lower(middleitem)) = Trim(Lower(item)) Then
44
+ 'If Comp(MiddleItem, item, gb.binary) < 0 Then
45
+ If Comp(MiddleItem, item, gb.language) < 0 Then
46
+ first = middle + 1
47
+ Else
48
+ tlast = middle - 1
49
+ Endif
50
+
51
+ ' [GB2:TEXT] Else If Comp(MiddleItem, item, gb.text) < 0 Then 'ITEM > middle
52
+ Else If Comp(MiddleItem, item, gb.language) < 0 Then 'ITEM > middle
53
+ first = middle + 1
54
+ ' [GB2:TEXT] Else If Comp(MiddleItem, item, gb.text) > 0 Then 'ITEM < middle
55
+ Else If Comp(MiddleItem, item, gb.language) > 0 Then 'ITEM < middle
56
+ tlast = middle - 1
57
+ Endif
58
+ Until first > Tlast
59
+End
60
+
61
+
62
+Private Function old_BinarySearch(item As String) As Integer
63
+ Dim first, Tlast, middle As Integer
64
+
65
+ Dim MiddleItem As String
66
+ first = 0
67
+ Tlast = SortTable.count - 1
68
+ If item Like "*La tavola da surf*" Then
69
+ Print "break"
70
+ Stop
71
+ Endif
72
Repeat
73
middle = (first + tlast) / 2
74
MiddleItem = SortTable[middle]
75
If Trim(MiddleItem) = Trim(item) Then
76
Return middle
77
78
- 'gb.text is a case unsensitive comparision,
79
- 'we've to manage the sensitive comparision
80
- 'via a gb.binary search
81
+ ' 'gb.text is a case unsensitive comparision,
82
+ ' 'we've to manage the sensitive comparision
83
+ ' 'via a gb.binary search
84
Else If Trim(Lower(middleitem)) = Trim(Lower(item)) Then
85
- If Comp(MiddleItem, item, gb.binary) < 0 Then
86
+ 'If Comp(MiddleItem, item, gb.binary) < 0 Then
87
+ If Comp(MiddleItem, item, gb.ignorecase) < 0 Then
88
first = middle + 1
89
Else
90
tlast = middle - 1
91
92
Dim nr As String 'newrow
93
Dim ts As String = TableSeparator
94
Dim filesize As Long = 0
95
+ Dim itemname As String
96
97
If track = 0 Then track = ""
98
If myYear = 0 Then myYear = ""
99
100
If forcename <> "" Then
101
nr = nr & ts & "Filename" & ts & forcename
102
Else
103
- nr = nr & ts & "Filename" & ts & file.Name(filetoadd)
104
+ itemname = Trim(file.Name(filetoadd))
105
+ If itemname = "" Then itemname = filetoadd
106
+ nr = nr & ts & "Filename" & ts & itemname
107
Endif
108
109
nr = nr & ts & "Length" & ts & FormatTime(length)
110
xt7-player-mpv-0.11.381.tar.gz/.src/Classi/ShoutCastClass.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Classi/ShoutCastClass.class
Changed
201
1
2
3
End
4
5
+Private CachedGenres As New String[]
6
+
7
+Private Sub GetGenresFromCache(GenresTree As Treeview)
8
+ Dim genre, mylink, item As String
9
+ genrestree.clear
10
+ For Each item In cachedgenres
11
+ Try genre = Split(item, Chr(0))[0]
12
+ Try MyLink = Split(item, Chr(0))[1]
13
+ Try genrestree.Add(mylink, genre, stock["small/directory"])
14
+ Next
15
+End
16
+
17
+
18
+Public Function GetGenres(GenresTree As TreeView, Optional usecache As Boolean = True)
19
+ 'Enum shoucast genres and fill a treeview in the format
20
+ Dim i As Integer
21
+ Dim buffer, GenreName, description, numstations, mylink As String
22
+
23
+
24
+ Dim lines As New String[]
25
+ 'DIM AskUrl AS String = "http://yp.shoutcast.com/sbin/newxml.phtml?rss=1"
26
+ Dim AskUrl As String = "'http://api.shoutcast.com/legacy/genrelist?k=sh17tOUi_ezL61_A&rss=1'"
27
+ Dim tmpfile As String = Temp()
28
+ Dim wget As New Wgetclass
29
+
30
+ If usecache Then
31
+ GetGenresFromCache(GenresTree)
32
+ Return
33
+ Endif
34
+
35
+
36
+ tmpfile = wget.DownloadAsync(AskUrl, True)
37
+
38
+ Shell "grep -i 'title\\|description\\|link' " & tmpfile & "| sed 's/<\\/[^>]*>/&\\n/g'" To buffer
39
+ buffer = Replace(buffer, "<item>", "<item>\n")
40
+
41
+
42
+ 'SHELL "grep -i 'title\\|description\\|link' /tmp/xml.xml" TO buffer
43
+ Lines = Split(buffer, "\n", "", True) '<<-- non ci sono più i \n,
44
+ 'forse conviene aggiungerli a mano dopo qualsiasi tag del genere "</*>"
45
+ 'per esempio, t"</title>" diventa "</title>\n"
46
+ 'nel caso tornassero i "\n", se ne avrebbero allora due di seguito,
47
+ 'in quel caso basta ignorare i void tramite la funzione "split" di gambas
48
+ 'find where to begin parsing stations (triple in order title,description,link)
49
+ i = 0
50
+
51
+ GenresTree.clear
52
+ CachedGenres.clear
53
+ Repeat
54
+ For i = i To lines.Count - 3
55
+ If (lines[i] Like "*<title>*") And (lines[i + 1] Like "<description>*") And (lines[i + 2] Like "<link>*") Then
56
+ Break
57
+ Endif
58
+ Next 'i
59
+ If i + 2 = lines.count Then Break
60
+ 'begin parsing
61
+
62
+ Genrename = Split(lines[i], ">")[1]
63
+ Genrename = Split(GenreName, "<")[0]
64
+ 'GenreName = Mid(lines[i], Len("<title>") + 1, Len(lines[i]) - (Len("<title>") + 1) * 2)
65
+ i = i + 1
66
+ 'description = Mid(lines[i], Len("<description>") + 1, Len(lines[i]) - (Len("<description>") + 1) * 2)
67
+ Description = Split(lines[i], ">")[1]
68
+ Description = Split(Description, "<")[0]
69
+ numstations = Trim(Split(description, ":")[1])
70
+ i = i + 1
71
+ myLINK = Mid(lines[i], Len("<link>") + 1, Len(lines[i]) - (Len("<link>") + 1) * 2)
72
+ i = i + 1
73
+ 'GenresTree.Add(MyLink, GenreName & ts & " - [" & numstations & "]", picture["shoutcast16.png"])
74
+ Try GenresTree.Add(MyLink, GenreName, stock["small/directory"]) 'picture["shoutcast16.png"])
75
+ CachedGenres.Add(GenreName & Chr(0) & MyLink)
76
+ Until (i + 3) >= lines.count
77
+End
78
+
79
80
-Public Function GetGenres(GenresTree As TreeView)
81
+Public Function OLD_GetGenres(GenresTree As TreeView)
82
'Enum shoucast genres and fill a treeview in the format
83
Dim i As Integer
84
Dim buffer, GenreName, description, numstations, mylink As String
85
86
Wait 0.1 'needed for grid select event to fill new mplayer.media_fullpath,maybe tunable
87
End
88
89
-Public Sub FillCachedGenres(GenresTree As TreeView)
90
- GenresTree.clear
91
- GenresTree.Add("24h", "24h", picture["shoutcast16.png"])
92
- GenresTree.Add("24hs", "24hs", picture["shoutcast16.png"])
93
- GenresTree.Add("4alga", "4alga", picture["shoutcast16.png"])
94
- GenresTree.Add("50s", "50s", picture["shoutcast16.png"])
95
- GenresTree.Add("60s", "60s", picture["shoutcast16.png"])
96
- GenresTree.Add("70s", "70s", picture["shoutcast16.png"])
97
- GenresTree.Add("80er", "80er", picture["shoutcast16.png"])
98
- GenresTree.Add("80s", "80s", picture["shoutcast16.png"])
99
- GenresTree.Add("90s", "90s", picture["shoutcast16.png"])
100
- GenresTree.Add("Acid", "Acid", picture["shoutcast16.png"])
101
- GenresTree.Add("Adult", "Adult", picture["shoutcast16.png"])
102
- GenresTree.Add("Adulto", "Adulto", picture["shoutcast16.png"])
103
- GenresTree.Add("African", "African", picture["shoutcast16.png"])
104
- GenresTree.Add("Afro", "Afro", picture["shoutcast16.png"])
105
- GenresTree.Add("Albanian", "Albanian", picture["shoutcast16.png"])
106
- GenresTree.Add("Album", "Album", picture["shoutcast16.png"])
107
- GenresTree.Add("All", "All", picture["shoutcast16.png"])
108
- GenresTree.Add("Alles", "Alles", picture["shoutcast16.png"])
109
- GenresTree.Add("Alsong", "Alsong", picture["shoutcast16.png"])
110
- GenresTree.Add("Alt", "Alt", picture["shoutcast16.png"])
111
- GenresTree.Add("Alternative", "Alternative", picture["shoutcast16.png"])
112
- GenresTree.Add("Ambient", "Ambient", picture["shoutcast16.png"])
113
- GenresTree.Add("Americana", "Americana", picture["shoutcast16.png"])
114
- GenresTree.Add("Anime", "Anime", picture["shoutcast16.png"])
115
- GenresTree.Add("Anos", "Anos", picture["shoutcast16.png"])
116
- GenresTree.Add("Aqui", "Aqui", picture["shoutcast16.png"])
117
- GenresTree.Add("Arabesk", "Arabesk", picture["shoutcast16.png"])
118
- GenresTree.Add("Arabic", "Arabic", picture["shoutcast16.png"])
119
- GenresTree.Add("Armenian", "Armenian", picture["shoutcast16.png"])
120
- GenresTree.Add("Art", "Art", picture["shoutcast16.png"])
121
- GenresTree.Add("Asian", "Asian", picture["shoutcast16.png"])
122
- GenresTree.Add("Audio", "Audio", picture["shoutcast16.png"])
123
- GenresTree.Add("Auto", "Auto", picture["shoutcast16.png"])
124
- GenresTree.Add("Autocity", "Autocity", picture["shoutcast16.png"])
125
- GenresTree.Add("Autodj", "Autodj", picture["shoutcast16.png"])
126
- GenresTree.Add("Autopilot", "Autopilot", picture["shoutcast16.png"])
127
- GenresTree.Add("Backup", "Backup", picture["shoutcast16.png"])
128
- GenresTree.Add("Baladas", "Baladas", picture["shoutcast16.png"])
129
- GenresTree.Add("Balkan", "Balkan", picture["shoutcast16.png"])
130
- GenresTree.Add("Banda", "Banda", picture["shoutcast16.png"])
131
- GenresTree.Add("Bangla", "Bangla", picture["shoutcast16.png"])
132
- GenresTree.Add("Basque", "Basque", picture["shoutcast16.png"])
133
- GenresTree.Add("Beatles", "Beatles", picture["shoutcast16.png"])
134
- GenresTree.Add("Best", "Best", picture["shoutcast16.png"])
135
- GenresTree.Add("Bible", "Bible", picture["shoutcast16.png"])
136
- GenresTree.Add("Big", "Big", picture["shoutcast16.png"])
137
- GenresTree.Add("Black", "Black", picture["shoutcast16.png"])
138
- GenresTree.Add("Bluegrass", "Bluegrass", picture["shoutcast16.png"])
139
- GenresTree.Add("Blues", "Blues", picture["shoutcast16.png"])
140
- GenresTree.Add("Bollywood", "Bollywood", picture["shoutcast16.png"])
141
- GenresTree.Add("Bossa", "Bossa", picture["shoutcast16.png"])
142
- GenresTree.Add("Brasil", "Brasil", picture["shoutcast16.png"])
143
- GenresTree.Add("Brazilian", "Brazilian", picture["shoutcast16.png"])
144
- GenresTree.Add("Breakbeat", "Breakbeat", picture["shoutcast16.png"])
145
- GenresTree.Add("Breakcore", "Breakcore", picture["shoutcast16.png"])
146
- GenresTree.Add("Breaks", "Breaks", picture["shoutcast16.png"])
147
- GenresTree.Add("C64", "C64", picture["shoutcast16.png"])
148
- GenresTree.Add("Cajun", "Cajun", picture["shoutcast16.png"])
149
- GenresTree.Add("Campus", "Campus", picture["shoutcast16.png"])
150
- GenresTree.Add("Campusradio", "Campusradio", picture["shoutcast16.png"])
151
- GenresTree.Add("Canal", "Canal", picture["shoutcast16.png"])
152
- GenresTree.Add("Canli", "Canli", picture["shoutcast16.png"])
153
- GenresTree.Add("Caribbean", "Caribbean", picture["shoutcast16.png"])
154
- GenresTree.Add("Carnaval", "Carnaval", picture["shoutcast16.png"])
155
- GenresTree.Add("Cat", "Cat", picture["shoutcast16.png"])
156
- GenresTree.Add("Catholic", "Catholic", picture["shoutcast16.png"])
157
- GenresTree.Add("Celtic", "Celtic", picture["shoutcast16.png"])
158
- GenresTree.Add("Charts", "Charts", picture["shoutcast16.png"])
159
- GenresTree.Add("Chill", "Chill", picture["shoutcast16.png"])
160
- GenresTree.Add("Chillout", "Chillout", picture["shoutcast16.png"])
161
- GenresTree.Add("Chinese", "Chinese", picture["shoutcast16.png"])
162
- GenresTree.Add("Chr", "Chr", picture["shoutcast16.png"])
163
- GenresTree.Add("Christian", "Christian", picture["shoutcast16.png"])
164
- GenresTree.Add("Christmas", "Christmas", picture["shoutcast16.png"])
165
- GenresTree.Add("Church", "Church", picture["shoutcast16.png"])
166
- GenresTree.Add("Clasic", "Clasic", picture["shoutcast16.png"])
167
- GenresTree.Add("Clasica", "Clasica", picture["shoutcast16.png"])
168
- GenresTree.Add("Clasicos", "Clasicos", picture["shoutcast16.png"])
169
- GenresTree.Add("Classic", "Classic", picture["shoutcast16.png"])
170
- GenresTree.Add("Classical", "Classical", picture["shoutcast16.png"])
171
- GenresTree.Add("Club", "Club", picture["shoutcast16.png"])
172
- GenresTree.Add("College", "College", picture["shoutcast16.png"])
173
- GenresTree.Add("Comedy", "Comedy", picture["shoutcast16.png"])
174
- GenresTree.Add("Community", "Community", picture["shoutcast16.png"])
175
- GenresTree.Add("Compas", "Compas", picture["shoutcast16.png"])
176
- GenresTree.Add("Contemporary", "Contemporary", picture["shoutcast16.png"])
177
- GenresTree.Add("Contempory", "Contempory", picture["shoutcast16.png"])
178
- GenresTree.Add("Cool", "Cool", picture["shoutcast16.png"])
179
- GenresTree.Add("Country", "Country", picture["shoutcast16.png"])
180
- GenresTree.Add("Cristiana", "Cristiana", picture["shoutcast16.png"])
181
- GenresTree.Add("Croatia", "Croatia", picture["shoutcast16.png"])
182
- GenresTree.Add("Croatian", "Croatian", picture["shoutcast16.png"])
183
- GenresTree.Add("Crossover", "Crossover", picture["shoutcast16.png"])
184
- GenresTree.Add("Cultural", "Cultural", picture["shoutcast16.png"])
185
- GenresTree.Add("Cumbia", "Cumbia", picture["shoutcast16.png"])
186
- GenresTree.Add("Dakwah", "Dakwah", picture["shoutcast16.png"])
187
- GenresTree.Add("Damar", "Damar", picture["shoutcast16.png"])
188
- GenresTree.Add("Dance", "Dance", picture["shoutcast16.png"])
189
- GenresTree.Add("Dancefloor", "Dancefloor", picture["shoutcast16.png"])
190
- GenresTree.Add("Dancehall", "Dancehall", picture["shoutcast16.png"])
191
- GenresTree.Add("Dark", "Dark", picture["shoutcast16.png"])
192
- GenresTree.Add("Death", "Death", picture["shoutcast16.png"])
193
- GenresTree.Add("Decades", "Decades", picture["shoutcast16.png"])
194
- GenresTree.Add("Deep", "Deep", picture["shoutcast16.png"])
195
- GenresTree.Add("Demo", "Demo", picture["shoutcast16.png"])
196
- GenresTree.Add("Deportes", "Deportes", picture["shoutcast16.png"])
197
- GenresTree.Add("Der", "Der", picture["shoutcast16.png"])
198
- GenresTree.Add("Desi", "Desi", picture["shoutcast16.png"])
199
- GenresTree.Add("Deutsch", "Deutsch", picture["shoutcast16.png"])
200
- GenresTree.Add("Disco", "Disco", picture["shoutcast16.png"])
201
xt7-player-mpv-0.11.381.tar.gz/.src/Classi/TagLib.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Classi/TagLib.class
Changed
10
1
2
Public Channels As String
3
4
Public Function IsSupported(filename As String) As Boolean
5
- Dim extensions As String = "*.mp3;*.ogg;*.oga;*.flac;*.mpc;*.speex;*.spx;*.wavpack;*.wv;*.trueaudio;*.tta;*.aiff"
6
+ Dim extensions As String = "*.mp3;*.ogg;*.oga;*.flac;*.mpc;*.speex;*.spx;*.wavpack;*.wv;*.trueaudio;*.tta;*.aiff;"
7
Dim fileExt As String = "." & File.Ext(filename)
8
If fileext = "." Then Return False
9
If (InStr(Upper(extensions), Upper(fileExt & ";")) > 0) Then
10
xt7-player-mpv-0.11.381.tar.gz/.src/Classi/YoutubeClass.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Classi/YoutubeClass.class
Changed
26
1
2
End
3
4
5
+Private supported_domains As String[]
6
+Public Function is_supported(url As String) As Boolean
7
+ Dim domain As String
8
+ If supported_domains = Null Then
9
+ supported_domains = New String[]
10
+ 'for site in $(grep -R -A10 "VALID_URL" |grep http|grep \:\/\/|grep \.py|awk -F '[h][t][t][p]' '{print"http",$2 }' OFS=''|sed 's/http\:\/\//_/;s/https\:\/\//_/;s/https?\:\/\//_/'|grep '/'|sed 's/(?://'|sed 's/\\././'|sed 's/)?//'|sed 's/?\\//'|sed 's/\\././'|sed 's/\\././'|cut -d "/" -f 1|sed 's/.+?.//'|sort -u|grep '\.'|sed 's/(?P//'|sed 's/<url>//'|sed 's/<host>//'|sed 's/(?://'|sed 's/)?//'|sed 's/\.\././'|sed 's/?www/www/'|sed 's/\.+\./\./'|sed 's/.*?././'|sed 's/\[a-z\].*//'|sed 's/\[a-.*//'| sed 's/\[\^\.\]+//' | sed 's/\[.*\]//' | sed 's/\.$//' | sed 's/).$//'|tr '|' '\n'|sed 's/)//'| sed 's/www//'|sort -u|sed 's/^_//'|sed 's/^\.//'|sort -u|grep '\.'| sed 's/\\\././'| sed 's/<.*>//'|sed 's/+//'|sed 's/^\.//'|grep '\.'|sed 's/^\-//'|sed 's/%//'|sed 's/.*\.$//'|sort -u) ; do echo *\.$site\/* ; echo *\/$site/* ; done ; for site in $(youtube-dl --list-extractors |cut -d "." -f 1|cut -d ":" -f 1|sort -u) ; do echo *\.$site.* ; echo *\/$site.*;done
11
+ supported_domains = Split(File.Load("ytdl_list.txt"), "\n", "", True)
12
+ Endif
13
+ For Each domain In supported_domains
14
+ If url Like domain Then
15
+ global.myDebug(url & " supported by match with " & domain)
16
+ Return True
17
+ Endif
18
+ Next
19
+ Return False
20
+End
21
+
22
+
23
Private Function webkey() As String
24
Dim mywget As New Wgetclass
25
Dim wk As String
26
xt7-player-mpv-0.11.381.tar.gz/.src/Form/AddUriForm.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/AddUriForm.class
Changed
10
1
2
End With
3
btnOK.Enabled = True
4
AddUriForm.mouse = Mouse.Default
5
+ fmain.MyLibrary.Save(fmain.LibraryGrid, global.confpath)
6
+ fmain.MyPlaylist.Save(fmain.PlaylistGrid, global.confpath)
7
End
8
9
Public Sub btnCancel_Click()
10
xt7-player-mpv-0.11.381.tar.gz/.src/Form/CoverManager.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/CoverManager.class
Changed
79
1
2
Endif
3
Else ' IF NOT Exist(coverfile) THEN 'se la cover non esiste, ricava un nuovo coverfile:
4
5
- If global.IsNetworkURI(uripath) Then
6
+ If global.isytdl(uripath) Then
7
+ coverfile = "ytdl.png"
8
+ defaultcover = True
9
+ Else If global.IsNetworkURI(uripath) Then
10
coverfile = "webradio.png"
11
defaultcover = True
12
Else If global.IsVideoFile(uripath) Then
13
- coverfile = "videocover.png"
14
- defaultcover = True
15
+ coverfile = "videocover.png"
16
+ defaultcover = True
17
Else 'non è una uri di rete, non è una radio e non c'è alcuna copertina già salvata:
18
- found = False
19
- coverfile = "emptycover.png"
20
- defaultcover = True
21
+ found = False
22
+ coverfile = "emptycover.png"
23
+ defaultcover = True
24
Endif
25
+
26
cachefile = coverfile & "_thumbcache" & CStr(height) & "." & File.ext(coverfile)
27
Try Return CoverCacheList[cachefile].Picture
28
If Error Then 'se non la trovi in memoria,
29
30
PrevFilter = myDialog.filter
31
Prevtitle = myDialog.title
32
myDialog.Title = ("Load a Jpg cover image")
33
- myDialog.filter = ["*.jpg", "jpg files"]
34
+ myDialog.filter = ["*.jpg;*.jpeg;*.JPG;*.JPEG", "jpg files"]
35
End With
36
If myDialog.OpenFile() Then Return
37
myDialog.filter = PrevFilter
38
39
If Not global.IsNetworkURI(fullpath) Then
40
If Not Exist(fullpath) Then
41
global.myDebug("Missing file! " & fullpath)
42
+ Stop
43
FileNotFoundAdd(fullpath)
44
'mygrid[row, 0].picture = picture["icon:/" & (rowheight -global.rowpadding) & "/error"]
45
mygrid[row, column].text = ""
46
47
Endif
48
49
If Global.IsAudioFile(fullpath) Then
50
- Return Stock[CStr(rowheight - localrowpadding) & "/audio"]
51
+ Return Icon_audio(CStr(rowheight - localrowpadding))
52
Else If Global.IsVideoFile(fullpath) Then
53
- Return Stock[CStr(rowheight - localrowpadding) & "/video"]
54
+ Return Icon_video(CStr(rowheight - localrowpadding))
55
Else If Global.IsDvbURI(fullpath) Then
56
Return picture["filetypedvb.png"].Image.Stretch(rowheight, rowheight).picture
57
Else If FMain.Youtube.IsYoutubeLink(fullpath) Then
58
Return picture["youtubeicon.png"].Image.Stretch(rowheight, rowheight).picture
59
+ Else If global.isytdl(fullpath) Then
60
+ Return picture["ytdl.png"].Image.Stretch(rowheight, rowheight).picture
61
Else If Global.IsNetworkURI(fullpath) Then
62
Return Stock[rowheight & "/network"]
63
Else
64
65
End
66
67
68
+Public Function Icon_audio(size As String) As Picture
69
+ Return Stock[CStr(size) & "/audio"]
70
+End
71
+
72
+Public Function Icon_video(size As String) As Picture
73
+ Return Stock[CStr(size) & "/video"]
74
+End
75
+
76
77
78
79
xt7-player-mpv-0.11.381.tar.gz/.src/Form/FMain.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/FMain.class
Changed
201
1
2
3
'Copyright (C) 2007, 2008 Antonio Orefice
4
5
+Private timer_runtime_infos As Timer
6
+
7
Public AlreadyLoaded As Boolean = False 'true if the form loaded it's settings from disk at least one time
8
'Private exportfilespath As String 'mpv 0.11 removed af_export filter :(
9
'Public exportfile As String 'mpv 0.11 removed af_export filter :(
10
11
12
Public TagEditMode As Boolean = False
13
14
-'Public trayicon1 As Trayicon 'fixme trayicon
15
+Public TrayIcon2 As Trayicon 'fixme trayicon
16
17
Public Sub InitTrayIcon()
18
-'fixme trayicon
19
- ' Dim SystemTray As Boolean = True
20
- ' Try SystemTray = desktop.HasSystemTray
21
- ' If Error Then
22
- ' global.myDebug("Couldn't check if your desktop has a system tray, assuming it has")
23
- ' Endif
24
- ' If Not SystemTray Then Return
25
- ' Try trayicon1 = New Trayicon
26
- ' If Error Then global.myDebug("Cannot Init Trayicon")
27
- ' 'trayicon1.Picture = picture.Load("trayicon.png")
28
- ' trayicon1.Picture = picture.Load("xt7-player-mpv.png")
29
- ' 'trayicon1.Picture.Image.Stretch(trayicon1.w, trayicon1.h)
30
- ' trayicon1.Visible = True
31
- ' Try Object.Attach(Trayicon1, Me, "Trayicon1")
32
- ' If Error Then global.myDebug("Cannot Init Trayicon")
33
+ 'fixme trayicon
34
+
35
+ Dim SystemTray As Boolean = True
36
+ Try SystemTray = desktop.HasSystemTray
37
+ If Error Then
38
+ global.myDebug("Couldn't check if your desktop has a system tray, assuming it has")
39
+ Endif
40
+
41
+ If Not SystemTray Then Return
42
+ Try TrayIcon2 = New Trayicon
43
+ If Error Then global.myDebug("Cannot Init Trayicon")
44
+ 'TrayIcon2.Picture = picture.Load("trayicon.png")
45
+ TrayIcon2.Picture = picture.Load("xt7-player-mpv.png")
46
+ 'TrayIcon2.Picture.Image.Stretch(TrayIcon2.w, TrayIcon2.h)
47
+ TrayIcon2.Visible = True
48
+ object.Attach(TrayIcon2, Me, "TrayIcon2")
49
+ TrayIcon2.PopupMenu = "MenuMain"
50
+
51
+ If Error Then global.myDebug("Cannot Init Trayicon")
52
End
53
54
Public Sub Form_Open()
55
56
Try MakeProfileMenu()
57
Try GetLastVersion()
58
fsform.Move(Screens[fmain.screen].x, Screens[fmain.screen].y, Screens[fmain.screen].w, Screens[fmain.screen].H)
59
+
60
+ timer_runtime_infos = New Timer As "timer_runtime_infos"
61
+ timer_runtime_infos.enabled = False
62
+
63
End
64
65
Private Sub MakeProfileMenu()
66
67
Dim i As Integer
68
Dim cTime As Integer = 0
69
Dim audio_codec As String = ""
70
+ Dim chapter As Integer
71
72
If Not mplayer.ProcessRunningOvr() Then Return
73
74
75
76
PropertiesGrid[5, 1].text = mplayer.getP("Album")
77
PropertiesGrid[6, 1].text = OneOf(mplayer.getP("artist"), mplayer.getP("author"))
78
- PropertiesGrid[7, 1].text = OneOf(mplayer.getP("title"), mplayer.getP("name"))
79
+
80
+
81
PropertiesGrid[8, 1].text = OneOf(mplayer.getP("year"), mplayer.getP("creationdate"))
82
PropertiesGrid[9, 1].text = mplayer.getP("genre")
83
+
84
PropertiesGrid[10, 1].text = mplayer.getP("trackno")
85
+ If PropertiesGrid[10, 1].text Like "*unavailable*" Then
86
+ If mplayer.getP("fullpath") Like "*.cue" Then
87
+ Try chapter = CInt(mplayer.getP("=chapter")) + 1
88
+ Try PropertiesGrid[10, 1].text = CStr(chapter)
89
+ Endif
90
+ Endif
91
+
92
+
93
+ PropertiesGrid[7, 1].text = OneOf(mplayer.getP("title"), mplayer.getP("name"))
94
+ If PropertiesGrid[7, 1].text Like "*unavailable*" Then
95
+ If mplayer.getP("fullpath") Like "*.cue" Then
96
+ Try PropertiesGrid[7, 1].text = CStr(mplayer.get_property_mpv("chapter-metadata/title"))
97
+ Endif
98
+ Endif
99
+
100
+
101
PropertiesGrid[11, 1].text = OneOf(mplayer.getP("Comment"), mplayer.getP("Comments"))
102
103
Endif
104
105
audioform.label14.text = PropertiesGrid[8, 1].text
106
audioform.label15.text = PropertiesGrid[7, 1].text
107
audioform.label16.text = PropertiesGrid[11, 1].text
108
- audioform.label18.text = PropertiesGrid[1, 1].text
109
- audioform.label19.text = PropertiesGrid[3, 1].text
110
+ 'commented out the very next because this will be filled by mpv when the name property changes.
111
+ 'audioform.label18.text = PropertiesGrid[1, 1].text
112
+
113
+ 'audioform.label19.text = PropertiesGrid[3, 1].text
114
If Trim(PropertiesGrid[2, 1].text) <> "" Then
115
audioform.label20.text = PropertiesGrid[2, 1].text & "KB"
116
Else
117
118
Endif
119
Try audio_codec = Split(Trim(PropertiesGrid[14, 1].text), " ", "", True)[0]
120
If audio_codec <> "" Then audioform.label21.text = audio_codec
121
- If (Trim(PropertiesGrid[15, 1].text) <> "") Then audioform.label21.text = audioform.label21.text & "@" & PropertiesGrid[15, 1].text
122
- If (Trim(PropertiesGrid[12, 1].text) <> "") Then audioform.label21.text = audioform.label21.text & ", " & PropertiesGrid[12, 1].text & (" channels")
123
- If (Trim(PropertiesGrid[13, 1].text) <> "") Then audioform.label21.text = audioform.label21.text & "@" & PropertiesGrid[13, 1].text & "Hz"
124
+ If (Trim(PropertiesGrid[15, 1].text) <> "") Then audioform.label21.text &= "@" & PropertiesGrid[15, 1].text
125
+ If (Trim(PropertiesGrid[12, 1].text) <> "") Then audioform.label21.text &= ", " & ("Channels") & ": " & PropertiesGrid[12, 1].text
126
+ If (Trim(PropertiesGrid[13, 1].text) <> "") Then audioform.label21.text &= ", " & ("Rate") & ": " & PropertiesGrid[13, 1].text & "Hz"
127
Endif
128
129
If (global.IsAudioFile(mplayer.getP("fullpath"))) Or (global.IsNetworkURI(mplayer.getP("fullpath"))) Or (Lower(mplayer.getP("fullpath")) Like "cdd?://*") Then
130
131
132
ChooseAspect.visible = False
133
'it is needed for lockfile and local socket to be correctly freed:
134
- 'Try trayicon1.Delete 'fixme trayicon
135
+ Try TrayIcon2.Delete 'fixme trayicon
136
Closing = True
137
138
139
140
Public Sub ButtonStop_Click()
141
' Return
142
' Dim a As Integer = 1 / 0
143
+ timer_runtime_infos.stop
144
+ timerqueue.stop
145
switchresBTN.enabled = True
146
global.mouse_wait(fmain, False)
147
InitABLoop()
148
149
Try ClearStreamsMenu()
150
Try epgform.dvbsnoop.Stopit()
151
ButtonNowNext.Hide()
152
+ ChaptersBtn.Hide()
153
ArrangeCpl()
154
'UpdateSeekSlider() 'fixmempv cambiati header
155
'SeekBar_Change() 'fixmempv cambiati header
156
157
Dim chaptermenu As Menu
158
Dim i As Integer
159
Try ClearMenu(menuchapters)
160
-
161
+ ChaptersBtn.visible = False
162
menuchapters.enabled = False
163
Try chapters = mplayer.get_chapters()
164
If chapters = Null Then Return
165
+ ChaptersBtn.visible = chapters.count > 1
166
If chapters.count = 0 Then Return
167
168
menuchapters.enabled = True
169
170
171
ClearChaptersAndTitlesMenu()
172
If Not mplayer.ProcessRunningOvr() Then Return False
173
- p = mplayer.get_property_mpv("path", True, 1000, True)
174
+ p = mplayer.get_property_mpv("path", True, 10, True)
175
If p = "" Then Return
176
ddevice = "/" & dvd_device(p)
177
- dtl = mplayer.get_property_mpv("=disc-title-list", True, 1000)
178
+ dtl = mplayer.get_property_mpv("=disc-title-list", True, 10)
179
180
If dtl = "" Then
181
global.myDebug(("Could not get information about the dvd structure"))
182
183
Next 'title
184
If Not (Lower(p) Like "dvd://menu*") Then
185
Try treeview1.movefirst
186
- Try pt = CInt(mplayer.get_property_mpv("=disc-title", True, 100, False))
187
+ Try pt = CInt(mplayer.get_property_mpv("=disc-title", True, 10, False))
188
For ct = 0 To pt - 1
189
Try treeview1.MoveBelow()
190
Next
191
192
Try treeview1.Item.selected = True
193
lk = treeview1.Item.Key
194
'fill chapters
195
- dcl = mplayer.get_property_mpv("=chapter-list", True, 1000)
196
+ dcl = mplayer.get_property_mpv("=chapter-list", True, 10)
197
dcl = Replace(dcl, "[", "")
198
dcl = Replace(dcl, "]", "")
199
dcl = Replace(dcl, "},{", Chr(8))
200
201
xt7-player-mpv-0.11.381.tar.gz/.src/Form/FMain.form -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/FMain.form
Changed
201
1
2
# Gambas Form File 3.0
3
4
{ Form Form
5
- MoveScaled(0,0,115,77)
6
+ MoveScaled(0,0,105,76)
7
Text = ("xt7-player-mpv")
8
Icon = Picture["xt7-player-mpv.png"]
9
Persistent = True
10
11
Picture = Picture["icon:/small/cdrom"]
12
{ MenuDvdDrive Menu
13
Text = ("From DVD drive")
14
- Picture = Picture["icon:/16/cdrom"]
15
+ Picture = Picture["icon:/small/cdrom"]
16
}
17
{ MenuDvdFile Menu
18
Text = ("From an ISO")
19
20
}
21
}
22
{ MainToolBar Panel
23
- MoveScaled(1,-1,95,5)
24
+ MoveScaled(0,-1,95,5)
25
Arrangement = Arrange.Horizontal
26
{ ButtonmenuNEWBTN MenuButton
27
MoveScaled(0,1,8,4)
28
29
Arrangement = Arrange.Fill
30
Border = Border.Plain
31
{ LibraryGrid GridView
32
- MoveScaled(3,2,24,23)
33
+ MoveScaled(3,2,24,25)
34
Tracking = True
35
ToolTip = ("Drag'n drop files, folders or media links to add them,")
36
Drop = True
37
38
Expand = True
39
}
40
{ Separator3 Separator
41
- MoveScaled(23,0,2,4)
42
+ MoveScaled(18,0,2,4)
43
}
44
{ ButtonSavePls Button
45
- MoveScaled(25,0,4,4)
46
+ MoveScaled(20,0,4,4)
47
ToolTip = ("Save the playlist")
48
Picture = Picture["icon:/16/save"]
49
}
50
{ ButtonDeletePls Button
51
- MoveScaled(29,0,4,4)
52
+ MoveScaled(24,0,4,4)
53
ToolTip = ("Delete the playlist")
54
Picture = Picture["icon:/16/delete"]
55
}
56
+ { ButtonDeletePls2 Button
57
+ MoveScaled(28,0,4,4)
58
+ ToolTip = ("Open the playlist folder")
59
+ Picture = Picture["icon:/16/directory"]
60
+ }
61
}
62
{ Panel1 Panel GridPanels
63
Name = "Panel1"
64
65
Text = ("Order by")
66
}
67
{ ComboBoxOrderBy ComboBox
68
- MoveScaled(9.4286,-12.2857,18,4)
69
+ MoveScaled(9.4286,-24.2857,18,4)
70
#Translate = False
71
Expand = True
72
ReadOnly = True
73
74
MoveScaled(1,11,36,15)
75
Expand = True
76
{ GenresTree TreeView
77
- MoveScaled(-2,0,35,9)
78
+ MoveScaled(0,1,35,9)
79
Tag = "shoutcast"
80
Expand = True
81
}
82
83
Arrangement = Arrange.Fill
84
Border = Border.Plain
85
{ PropertiesGrid GridView
86
- MoveScaled(2,1,33,30)
87
+ MoveScaled(2,0,33,30)
88
ToolTip = ("Info on playing media\nor on the last played one")
89
Expand = True
90
Border = False
91
}
92
}
93
{ Timer_mediainfo #Timer
94
- #MoveScaled(9,39)
95
+ #MoveScaled(13,40)
96
Delay = 3000
97
}
98
Index = 13
99
100
}
101
{ RightSidePanel Panel VideoAreaGroup
102
Name = "RightSidePanel"
103
- MoveScaled(46,6,60,65)
104
+ MoveScaled(44,7,60,65)
105
Tracking = True
106
Arrangement = Arrange.Vertical
107
+ { ToolbarBackground PictureBox
108
+ MoveScaled(1,3,19,0.8571)
109
+ #Translate = False
110
+ NoTabFocus = True
111
+ Picture = Picture["toolbarshade.png"]
112
+ Stretch = True
113
+ Alignment = Align.Left
114
+ }
115
{ TagPanel Panel
116
MoveScaled(27,3,30,45)
117
Expand = True
118
119
Expand = True
120
}
121
}
122
- { ToolbarBackground PictureBox
123
- MoveScaled(6,4,19,0.8571)
124
- #Translate = False
125
- NoTabFocus = True
126
- Picture = Picture["toolbarshade.png"]
127
- Stretch = True
128
- Alignment = Align.Left
129
- }
130
{ ABLoopTimer #Timer
131
- #MoveScaled(6,6)
132
+ #MoveScaled(1,6)
133
Delay = 75
134
}
135
{ OuterBox Panel VideoAreaGroup
136
Name = "OuterBox"
137
- MoveScaled(3,15,24,28)
138
+ MoveScaled(2,15,24,28)
139
Background = &H000000&
140
Tracking = True
141
Drop = True
142
143
Tracking = True
144
Drop = True
145
{ TimerHideShowVideo #Timer
146
- #MoveScaled(-3,2)
147
+ #MoveScaled(4,1)
148
Delay = 10
149
}
150
}
151
152
Background = &H000000&
153
}
154
}
155
- { TimerSeekThumble #Timer
156
- #MoveScaled(15,19)
157
- Delay = 100
158
- }
159
{ BottomVbox VBox
160
MoveScaled(0,48,71,14)
161
Background = Color.Background
162
163
ToolTip = ("Stop")
164
Picture = Picture["media-playback-stop.png"]
165
}
166
+ { ChaptersBtn Button
167
+ MoveScaled(15,0,4,4)
168
+ Visible = False
169
+ Font = Font["1"]
170
+ ToolTip = ("Chapters available")
171
+ Picture = Picture["icon:/22/view-detail"]
172
+ Border = False
173
+ }
174
{ Panel9 Panel
175
- MoveScaled(15,1,54,17)
176
+ MoveScaled(19,1,54,17)
177
Expand = True
178
Arrangement = Arrange.Fill
179
Padding = 8
180
{ ProgressFrame DrawingArea
181
- MoveScaled(0,1,53,16)
182
+ MoveScaled(-9,1,53,16)
183
Expand = True
184
Border = Border.Plain
185
{ Progress PictureBox
186
- MoveScaled(-2,-1,14,4)
187
+ MoveScaled(4,-1,14,4)
188
Picture = Picture["barglow.png"]
189
Stretch = True
190
}
191
192
}
193
}
194
{ ABLoopButton ToolButton
195
- MoveScaled(21,0,5,4)
196
+ MoveScaled(24,0,5,4)
197
Font = Font["Bold,-1"]
198
Picture = Picture["media-loop-off.png"]
199
}
200
{ ButtonRew ToolButton
201
xt7-player-mpv-0.11.381.tar.gz/.src/Form/GeneralOptions.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/GeneralOptions.class
Changed
62
1
2
End
3
4
Public Sub ColorChoose_Click()
5
+ If Not fmain.fullyloaded Then Return
6
myDialog.color = Last.background
7
If Not (myDialog.SelectColor()) Then
8
Try Last.background = myDialog.color
9
Endif
10
+ 'set progressbar color:
11
+ fmain.Progress.tag = "changecolor" 'force the folloging function to actually do something:
12
+ fmain.Initprogress()
13
End
14
15
Public Sub ResetButton_Click()
16
+ If Not fmain.fullyloaded Then Return
17
Try Last.next.text = "Default"
18
If Upper(Last.name) <> "RESETBUTTON2" Then
19
Try Last.next.NEXT.font = ""
20
21
22
23
Public Sub BackResetButton_Click()
24
+
25
If Upper(Last.name) = "BACKRESETBUTTON2" Then 'leftside lists
26
' [GB2:BCOL] Try Last.next.background = &EEEEFF&
27
Try Last.next.Background = &F5F5F5&
28
Else If Upper(Last.name) = "BACKRESETBUTTON3" Then 'trayicon
29
Last.next.Background = &2A2D3C&
30
Else If Upper(Last.name) = "BACKRESETBUTTON1" Then 'trayicon
31
- Last.next.Background = &FFFFFF&
32
+ Last.next.Background = &FFFFFF&
33
+ Else If Upper(Last.name) = "BACKRESETBUTTON6" Then 'PROGRESSBAR
34
+ Last.next.Background = Color.SelectedBackground
35
+ fmain.Progress.tag = "changecolor"
36
+ Fmain.Initprogress()
37
Else
38
' [GB2:BCOL] Try Last.next.background = color.default
39
Try Last.next.Background = color.default
40
41
'mpv 0.11 removed af_export filter :(
42
'8 5 42 40 43
43
noparse8.visible = False
44
- noparse5.visible = False
45
+ noparse5.visible = True
46
noparse42.visible = False
47
noparse40.visible = False
48
noparse43.visible = False
49
50
End
51
52
53
+
54
+Public Sub BackResetButton8_Click()
55
+ ComboPiPSize.text = "1/4"
56
+End
57
+
58
+Public Sub SeekThumbsCheckbox_Click()
59
+ NoParseStyle12.enabled = Last.value
60
+End
61
+
62
xt7-player-mpv-0.11.381.tar.gz/.src/Form/GeneralOptions.form -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/GeneralOptions.form
Changed
130
1
2
Index = 0
3
Text = ("Video")
4
{ ScrollView1 ScrollView
5
- MoveScaled(3,8,52,54)
6
+ MoveScaled(3,7,52,54)
7
Tag = "video"
8
Expand = True
9
Arrangement = Arrange.Vertical
10
11
Value = CheckBox.True
12
}
13
}
14
+ { NoParseStyle12 HBox
15
+ MoveScaled(1,16,50,4)
16
+ Spacing = True
17
+ Indent = True
18
+ { LabelThumbsize2 Label
19
+ MoveScaled(1,1,29,3)
20
+ ToolTip = ("Size of the live thumbnails (Picture in Picture)\nIt is relative to the width of the screen.")
21
+ AutoResize = True
22
+ Text = ("Live preview size (relative to screen width)")
23
+ }
24
+ { VBox10 VBox
25
+ MoveScaled(31,0,3,4)
26
+ Expand = True
27
+ }
28
+ { !ComboPiPSize ComboBox
29
+ MoveScaled(35,0,10,3)
30
+ #Public = True
31
+ #Translate = False
32
+ ReadOnly = True
33
+ List = ["1/2", "1/2.5", "1/3", "1/3.5", "1/4", "1/4.5", "1/5", "1/5.5", "1/6", "1/6.5", "1/7", "1/7.5", "1/8", "1/8.5", "1/9", "1/9.5", "1/10"]
34
+ Text = "1/5"
35
+ Sorted = True
36
+ }
37
+ { BackResetButton8 ToolButton
38
+ MoveScaled(45,0,4,4)
39
+ Picture = Picture["icon:/16/clear"]
40
+ }
41
+ }
42
{ NOPARSE_Separator1 Separator
43
- MoveScaled(-1,21,47,2)
44
+ MoveScaled(1,23,47,2)
45
}
46
{ NOPARSE_Label26 Label
47
MoveScaled(1,25,19,4)
48
49
}
50
}
51
{ Noparsesep675 Separator
52
- MoveScaled(4,37,45,1)
53
+ MoveScaled(4,36,45,1)
54
}
55
{ NoparseHbox8 HBox
56
- MoveScaled(2,45,52,4)
57
+ MoveScaled(2,44,52,4)
58
ToolTip = ("If the display video mode vertical refresh is close \nenough to an integer multiple of the played video, \nchange the playing speed so that a perfect match is achieved.\n\nThis helps to produce smoother video.")
59
Spacing = True
60
{ switchres_compensate_checkbox CheckBox
61
62
}
63
}
64
{ NoParse5 HBox
65
- MoveScaled(2,25,50,4)
66
+ MoveScaled(3,22,50,4)
67
ToolTip = ("Background image for the bottom panel.\nYou can also set this by dragging an image file or from a web page\ninto the bottom panel, just remember to save the profile.")
68
Spacing = True
69
{ NoParseLabel6 Label
70
71
}
72
}
73
{ NoParseStyle3 HBox
74
- MoveScaled(2,34,50,4)
75
+ MoveScaled(1,27,50,4)
76
Spacing = True
77
{ FontLabel3 Label
78
MoveScaled(1,1,17,3)
79
80
}
81
}
82
{ NoParseStyle9 HBox
83
- MoveScaled(2,39,50,4)
84
+ MoveScaled(2,32,50,4)
85
Spacing = True
86
{ FontLabel8 Label
87
MoveScaled(1,1,17,3)
88
89
}
90
}
91
{ NoParse30 HBox
92
- MoveScaled(2,44,50,4)
93
+ MoveScaled(2,38,50,4)
94
Spacing = True
95
{ HighlightCHK CheckBox
96
- MoveScaled(1,0,48,4)
97
+ MoveScaled(1,-1,48,4)
98
ToolTip = ("Highlight the sideview item which is under the mouse")
99
Expand = True
100
Text = ("Highlight listview items on mouse over")
101
}
102
}
103
+ { NoParseStyle10 HBox
104
+ MoveScaled(2,43,50,4)
105
+ Spacing = True
106
+ { LabelSeekbarColor Label
107
+ MoveScaled(2,1,23,3)
108
+ AutoResize = True
109
+ Text = ("Main ProgressBar color")
110
+ }
111
+ { VBox8 VBox
112
+ MoveScaled(28,1,3,4)
113
+ Expand = True
114
+ }
115
+ { BackResetButton6 ToolButton BackResetButton
116
+ Name = "BackResetButton6"
117
+ MoveScaled(41,0,4,4)
118
+ Picture = Picture["icon:/16/clear"]
119
+ }
120
+ { SeekbarColorButton Button ColorChoose
121
+ Name = "SeekbarColorButton"
122
+ MoveScaled(46,0,4,4)
123
+ Background = Color.SelectedBackground
124
+ Picture = Picture["icon:/16/color"]
125
+ }
126
+ }
127
{ NOPARSESEPARATOR1 Separator
128
MoveScaled(3,48,50,0.5714)
129
}
130
xt7-player-mpv-0.11.381.tar.gz/.src/Form/HotKeys.form -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/HotKeys.form
Changed
10
1
2
3
{ Form Form
4
MoveScaled(0,0,87.5714,60)
5
- ToolTip = ("Double click on a cell to enter a new hotkey.\nSelect a cell and hit \"canc\" to delete one.")
6
+ ToolTip = ("Double click on a cell to enter a new hotkey.\nSelect a cell and hit \"del\" to delete one.")
7
Text = ("Hotkeys")
8
Icon = Picture["icon:/small/shortcut"]
9
Persistent = True
10
xt7-player-mpv-0.11.381.tar.gz/.src/Form/NewChains.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/NewChains.class
Changed
10
1
2
Private Sub Init_drivers_video()
3
Dim drivers_video_list As New String[]
4
Dim driver As String
5
- drivers_video_list = ["opengl", "xv", "vdpau", "vaapi", "custom video", "null"]
6
+ drivers_video_list = ["opengl", "xv", "vdpau", "vaapi", "x11", "custom video", "null"]
7
For Each driver In drivers_video_list
8
draw_list_item(drivers_video_container, driver)
9
Next
10
xt7-player-mpv-0.11.381.tar.gz/.src/Form/NewChains.form -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/NewChains.form
Changed
28
1
2
Arrangement = Arrange.Vertical
3
Margin = True
4
Padding = 4
5
- Count = 6
6
+ Count = 7
7
Index = 0
8
Text = ("Xv")
9
{ xvScrollview ScrollView
10
11
}
12
}
13
Index = 4
14
+ Text = ("x11")
15
+ Index = 5
16
Text = ("Custom video")
17
{ CustomVideoScrollview ScrollView
18
MoveScaled(1,1,49,25)
19
20
}
21
}
22
}
23
- Index = 5
24
+ Index = 6
25
Text = ("null")
26
Index = 0
27
}
28
xt7-player-mpv-0.11.381.tar.gz/.src/Form/OpenSubtitesForm.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/OpenSubtitesForm.class
Changed
13
1
2
subname = subsview[subsview.row, columnindex["SubFileName"]].text
3
subfile = Temp() & "." & subname
4
If OpenSubs.savesub(suburl, subfile) Then
5
- FMain.mplayer.SubtitleAdd(subfile) 'add the subtitle and append it to mplayer.subtitletracks
6
- FMain.Displaysub(FMain.mplayer.getP("subtitletracks")[FMain.mplayer.getP("subtitletracks").count - 1])
7
+ 'FMain.mplayer.SubtitleAdd(subfile) 'add the subtitle and append it to mplayer.subtitletracks
8
+ fmain.sub_add(DConv(subfile)) 'add the subtitle and append it to mplayer.subtitletracks
9
+ 'FMain.Displaysub(FMain.mplayer.getP("subtitletracks")[FMain.mplayer.getP("subtitletracks").count - 1])
10
Endif
11
End
12
13
xt7-player-mpv-0.11.381.tar.gz/.src/Form/OverlayTrayTip.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/OverlayTrayTip.class
Changed
58
1
2
Public Sub Redraw(tip As String, x As Integer, y As Integer)
3
Dim DesktopH As Integer = Global.DektopHTotal()
4
Dim DesktopW As Integer = Global.DektopWTotal()
5
- UpdateInfos()
6
If y + Me.h > Desktoph Then y = Desktoph - Me.h
7
If x + Me.w + 8 > Desktopw Then x = Desktopw - Me.w - 8
8
Me.Move(x, y)
9
Me.stacking = Me.Above
10
+ OverlaytrayTip.show
11
+ UpdateInfos()
12
End
13
14
Public Sub UpdateScreenshot()
15
- If Not (FMain.mplayer.getP("audioonly") Or FMain.mplayer.paused()) Then
16
+ If Not (FMain.mplayer.getP("audioonly") Or FMain.mplayer.paused(True)) Then
17
panel1.Arrangement = Arrange.None
18
picturebox1.picture = FMain.mplayer.get_screenshot(True)
19
Try picturebox1.h = picturebox1.w / (FMain.mplayer.getP("video-params/dw") / FMain.mplayer.getP("video-params/dh"))
20
21
UpdateScreenshot()
22
Global.CenterObj(panel1, picturebox1)
23
picturebox1.x = 0
24
- UpdateInfos()
25
+ 'UpdateInfos()
26
timer1.start
27
End
28
29
30
31
32
Public Sub UpdateInfos()
33
+ Dim paused As Boolean = FMain.mplayer.Paused()
34
Dim fullpath As String = FMain.mplayer.getP("fullpath")
35
- If Not (FMain.mplayer.Paused()) Then
36
+ If Not Paused Then
37
'If Not (btnplaypause.picture = Picture["icon:/16/pause"]) Then btnplaypause.picture = Picture["icon:/16/pause"]
38
If Not (btnplaypause.picture = Picture["media-playback-pause.png"]) Then btnplaypause.picture = Picture["media-playback-start.png"]
39
Else
40
41
album = FMain.mplayer.getP("album")
42
song = FMain.mplayer.getP("title")
43
If song = "" Then song = FMain.PropertiesGrid[7, 1].text
44
- If Not FMain.mplayer.paused() Then TimeStr = FMain.mplayer.FormatTime(FMain.mplayer.CurrentTime()) & " / " & FMain.mplayer.getP("duration")
45
+ If Not paused Then TimeStr = FMain.mplayer.FormatTime(FMain.mplayer.CurrentTime()) & " / " & FMain.mplayer.getP("duration")
46
If Trim(artist) = "" Then artist = "Unknown Artist"
47
If Trim(album) = "" Then album = "Unknown Album"
48
If Trim(song) = "" Then song = "Unknown song"
49
50
51
label1.text = artist & "\n" & album & "\n" & song & "\n" & filename & "\n" & timestr
52
Else
53
- If Not FMain.mplayer.paused() Then TimeStr = FMain.mplayer.FormatTime(FMain.mplayer.CurrentTime()) & " / " & FMain.mplayer.getP("duration")
54
+ If Not paused Then TimeStr = FMain.mplayer.FormatTime(FMain.mplayer.CurrentTime()) & " / " & FMain.mplayer.getP("duration")
55
If Trim(filename) = "" Then filename = ("No file is playing")
56
label1.text = filename & "\n" & timestr
57
Endif
58
xt7-player-mpv-0.11.381.tar.gz/.src/Form/SubAndOsd.class -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/SubAndOsd.class
Changed
37
1
2
If FontStyleCHK.value Then
3
AssForceStyle = AssForceStyle & FontName
4
AssForceStyle = AssForceStyle & ",FontSize=" & CStr(FontString.Font.Size)
5
- If FontString.Font.Bold Then AssForceStyle = AssForceStyle & ",Bold=1"
6
+ 'If FontString.Font.Bold Then AssForceStyle = AssForceStyle & ",Bold=1"
7
+ If FontString.Font.Bold Then opts.push(o("sub-text-bold", "yes"))
8
If FontString.Font.Italic Then AssForceStyle = AssForceStyle & ",Italic=1"
9
10
SubFontName = FontString.Font.name
11
- If FontString.Font.Bold Then SubFontName &= ":style=bold" 'fixmempv: how to do italic and strikeout?
12
+ 'If FontString.Font.Bold Then SubFontName &= ":style=bold" 'fixmempv: how to do italic and strikeout?
13
opts.Push(o("sub-text-font", "\"" & SubFontName & "\""))
14
opts.Push(o("sub-text-font-size", CStr(FontString.Font.size)))
15
16
17
'osd related
18
If FontStyleCHK2.value Then
19
SubFontName = FontString2.Font.name
20
- If FontString2.Font.Bold Then SubFontName &= ":style=bold" 'fixmempv: how to do italic and strikeout?
21
+ 'If FontString2.Font.Bold Then SubFontName &= ":style=bold" 'fixmempv: how to do italic and strikeout?
22
+ If FontString2.Font.Bold Then opts.push(o("osd-bold", "yes"))
23
opts.Push(o("osd-font", "\"" & SubFontName & "\""))
24
opts.Push(o("osd-font-size", CStr(FontString2.Font.size)))
25
Endif
26
27
Public Sub pScaleFactorComboBox_Click()
28
TestBTN_Click()
29
End
30
+
31
+
32
+Public Sub notifytest_Arrange()
33
+
34
+ panelsubtitles.h = hbox1.y + hbox1.h + Desktop.scale * 2
35
+
36
+End
37
xt7-player-mpv-0.11.381.tar.gz/.src/Form/zzzFake.form -> xt7-player-mpv-0.12.381.tar.gz/.src/Form/zzzFake.form
Changed
21
1
2
}
3
}
4
{ PanelMini Panel
5
- MoveScaled(1,3,15,16)
6
+ MoveScaled(5,5,15,16)
7
Arrangement = Arrange.Fill
8
}
9
- { cachingbox MovieBox
10
- MoveScaled(18,3,16,16)
11
- Background = &H000000&
12
- Path = "caching.gif"
13
- Playing = True
14
- }
15
{ YTPanel Panel
16
- MoveScaled(2,-1,71,26)
17
+ MoveScaled(28,1,71,26)
18
Background = &H000000&
19
Ignore = True
20
Arrangement = Arrange.Horizontal
21
xt7-player-mpv-0.11.381.tar.gz/AA_ToDo -> xt7-player-mpv-0.12.381.tar.gz/AA_ToDo
Changed
50
1
2
3
4
Cambiamenti nel prossimo mpv:
5
-vdpau software filters:
6
-https://github.com/mpv-player/mpv/commit/4b0b9b515bee4a589ed74b4f5de86401f1745e69
7
-
8
-Addio menu dvd e bd
9
-https://github.com/mpv-player/mpv/commit/3b3170aedb4c8a9bfa32238f3b580feea22071f8
10
-
11
-
12
-
13
-Aggiungi i filtri video vdpaupp e vavpp
14
-...controlla comunque che i quei filtri siano inseriti automaticamente
15
-quando il player vuole deinterlacciare
16
-https://github.com/mpv-player/mpv/commit/db2268d5b11bfd290251b4aac7045535803f4d96
17
-
18
-
19
-controlla se le opzioni di yadif necessiato di aggiornamento nella gui:
20
-https://github.com/mpv-player/mpv/commit/25755f5fe75ad2a4ac9fb4ecf70f7bdf7a58a04c
21
-
22
-
23
-vdpaurb funziona solo se:
24
- la decodifica hardware è attiva
25
- la decodifica hardware è vdpau
26
-
27
-* posso inserire vdpaurb automaticamente?
28
- sì, è consentito.
29
- quando va inserito?
30
- quando la decodifica hardware è attiva (check prima di riavviare)
31
- quando la decodifica hardware è vdpau
32
- quando ci sono filtri video.
33
-
34
-
35
-https://github.com/mpv-player/mpv/blob/master/DOCS/interface-changes.rst
36
-
37
-
38
-
39
40
--------------------------------------------------------------------------
41
--------------------------------------------------------------------------
42
43
44
45
46
+Cambiamenti nel prossimo mpv:
47
+
48
+Riabilitare X11 :)
49
+mpv ha abilitato di la tag "Performer" per i .cue, traduci in artist.
50
xt7-player-mpv-0.12.381.tar.gz/ytdl.png
Added
xt7-player-mpv-0.12.381.tar.gz/ytdl_list.txt
Added
201
1
2
+*.(.daserste.de/*
3
+*/(.daserste.de/*
4
+*.(.quickvid.org/*
5
+*/(.quickvid.org/*
6
+*.(embed.live.huffingtonpost.com/*
7
+*/(embed.live.huffingtonpost.com/*
8
+*.*brightcove.com/*
9
+*/*brightcove.com/*
10
+*.*morningstar.com/*
11
+*/*morningstar.com/*
12
+*.1.wdr.de/*
13
+*/1.wdr.de/*
14
+*.11play.se/*
15
+*/11play.se/*
16
+*.13.cl/*
17
+*/13.cl/*
18
+*.1tv.ru/*
19
+*/1tv.ru/*
20
+*.220.ro/*
21
+*/220.ro/*
22
+*.22tracks.com/*
23
+*/22tracks.com/*
24
+*.24video.net/*
25
+*/24video.net/*
26
+*.3sat.de/*
27
+*/3sat.de/*
28
+*.4tube.com/*
29
+*/4tube.com/*
30
+*.5-tv.ru/*
31
+*/5-tv.ru/*
32
+*.56.com/*
33
+*/56.com/*
34
+*.8tracks.com/*
35
+*/8tracks.com/*
36
+*.8tv.cat/*
37
+*/8tv.cat/*
38
+*.90tv.ir/*
39
+*/90tv.ir/*
40
+*.91porn.com/*
41
+*/91porn.com/*
42
+*.9gag.com/*
43
+*/9gag.com/*
44
+*.abc.net.au/*
45
+*/abc.net.au/*
46
+*.abc7news.com/*
47
+*/abc7news.com/*
48
+*.academicearth.org/*
49
+*/academicearth.org/*
50
+*.add-anime.net/*
51
+*/add-anime.net/*
52
+*.adultswim.com/*
53
+*/adultswim.com/*
54
+*.adventure.howstuffworks.com/*
55
+*/adventure.howstuffworks.com/*
56
+*.aftenposten.no/*
57
+*/aftenposten.no/*
58
+*.air.mozilla.org/*
59
+*/air.mozilla.org/*
60
+*.aljazeera.com/*
61
+*/aljazeera.com/*
62
+*.all.mtvworldverticals.com/*
63
+*/all.mtvworldverticals.com/*
64
+*.allmyvideos.net/*
65
+*/allmyvideos.net/*
66
+*.allocine.fr/*
67
+*/allocine.fr/*
68
+*.alphaporno.com/*
69
+*/alphaporno.com/*
70
+*.anitube.se/*
71
+*/anitube.se/*
72
+*.anysex.com/*
73
+*/anysex.com/*
74
+*.aparat.com/*
75
+*/aparat.com/*
76
+*.api.dbtv.no/*
77
+*/api.dbtv.no/*
78
+*.api.dmcloud.net/*
79
+*/api.dmcloud.net/*
80
+*.api.globovideos.com/*
81
+*/api.globovideos.com/*
82
+*.api.khanacademy.org/*
83
+*/api.khanacademy.org/*
84
+*.api.letitbit.net/*
85
+*/api.letitbit.net/*
86
+*.api.netzkino.de.simplecache.net/*
87
+*/api.netzkino.de.simplecache.net/*
88
+*.api.noco.tv/*
89
+*/api.noco.tv/*
90
+*.api.reverbnation.com/*
91
+*/api.reverbnation.com/*
92
+*.api.soundcloud.com/*
93
+*/api.soundcloud.com/*
94
+*.api.video.mail.ru/*
95
+*/api.video.mail.ru/*
96
+*.archive.org/*
97
+*/archive.org/*
98
+*.ardmediathek.de/*
99
+*/ardmediathek.de/*
100
+*.arte.tv/*
101
+*/arte.tv/*
102
+*.atresplayer.com/*
103
+*/atresplayer.com/*
104
+*.audioapi.orf.at/*
105
+*/audioapi.orf.at/*
106
+*.audiomack.com/*
107
+*/audiomack.com/*
108
+*.azubu.tv/*
109
+*/azubu.tv/*
110
+*.bambuser.com/*
111
+*/bambuser.com/*
112
+*.bandcamp.com/*
113
+*/bandcamp.com/*
114
+*.bbc.co.uk/*
115
+*/bbc.co.uk/*
116
+*.bbc.com/*
117
+*/bbc.com/*
118
+*.beeg.com/*
119
+*/beeg.com/*
120
+*.behindkink.com/*
121
+*/behindkink.com/*
122
+*.bet.com/*
123
+*/bet.com/*
124
+*.beta.img.cbsnews.com/*
125
+*/beta.img.cbsnews.com/*
126
+*.bild.de/*
127
+*/bild.de/*
128
+*.bilibili.tv/*
129
+*/bilibili.tv/*
130
+*.bit.ly/*
131
+*/bit.ly/*
132
+*.blazo.bandcamp.com/*
133
+*/blazo.bandcamp.com/*
134
+*.blinkx.com/*
135
+*/blinkx.com/*
136
+*.blip.tv/*
137
+*/blip.tv/*
138
+*.blogs.cnn.com/*
139
+*/blogs.cnn.com/*
140
+*.blogs.elpais.com/*
141
+*/blogs.elpais.com/*
142
+*.blogtalkradio.com/*
143
+*/blogtalkradio.com/*
144
+*.bloomberg.com/*
145
+*/bloomberg.com/*
146
+*.bpb.de/*
147
+*/bpb.de/*
148
+*.br.de/*
149
+*/br.de/*
150
+*.break.com/*
151
+*/break.com/*
152
+*.bs.serving-sys.com/*
153
+*/bs.serving-sys.com/*
154
+*.bt.no/*
155
+*/bt.no/*
156
+*.business.com)/*
157
+*/business.com)/*
158
+*.buzzfeed.com/*
159
+*/buzzfeed.com/*
160
+*.byutv.org/*
161
+*/byutv.org/*
162
+*.c-span.org/*
163
+*/c-span.org/*
164
+*.c.brightcove.com/*
165
+*/c.brightcove.com/*
166
+*.cache.vevo.com/*
167
+*/cache.vevo.com/*
168
+*.camdemy.com/*
169
+*/camdemy.com/*
170
+*.canalc2.tv/*
171
+*/canalc2.tv/*
172
+*.canalplus.fr/*
173
+*/canalplus.fr/*
174
+*.cbs.com/*
175
+*/cbs.com/*
176
+*.cbsnews.com/*
177
+*/cbsnews.com/*
178
+*.cbssports.com/*
179
+*/cbssports.com/*
180
+*.cc.com/*
181
+*/cc.com/*
182
+*.ccc.crackle.com/*
183
+*/ccc.crackle.com/*
184
+*.cdn-images.deezer.com/*
185
+*/cdn-images.deezer.com/*
186
+*.cdn.embedly.com/*
187
+*/cdn.embedly.com/*
188
+*.cdn.playwire.com/*
189
+*/cdn.playwire.com/*
190
+*.cdn.videos.snotr.com/*
191
+*/cdn.videos.snotr.com/*
192
+*.cdnbakmi.kaltura.com/*
193
+*/cdnbakmi.kaltura.com/*
194
+*.ceskatelevize.cz/*
195
+*/ceskatelevize.cz/*
196
+*.channel9.msdn.com/*
197
+*/channel9.msdn.com/*
198
+*.chilloutzone.net/*
199
+*/chilloutzone.net/*
200
+*.chirb.it/*
201