Projects
Multimedia
xt7-player-mpv
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 7
View file
xt7-player-mpv.changes
Changed
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 27 18:00:31 UTC 2016 - avvissu@yandex.by + +- Update to 0.18.384: + * see: /usr/share/doc/packages/xt7-player-mpv/CHANGELOG_GIT + +------------------------------------------------------------------- Sun Apr 3 13:51:11 UTC 2016 - avvissu@yandex.by - Update to 0.16.384:
View file
xt7-player-mpv.spec
Changed
@@ -17,7 +17,7 @@ Name: xt7-player-mpv -Version: 0.16.384 +Version: 0.18.384 Release: 0 Summary: Qt/Gambas gui to mpv License: GPL-2.0+ @@ -78,7 +78,7 @@ Requires: gambas3-gb-web Requires: gambas3-gb-libxml Requires: gambas3-runtime >= 3.8.4 -Requires: mpv >= 0.14.0 +Requires: mpv >= 0.18.0 Requires: wget Requires: youtube-dl Recommends: dvb
View file
xt7-player-mpv-0.16.384.tar.gz/README
Deleted
@@ -1,49 +0,0 @@ -Xt7-Player (now xt7-player-mpv) is an open source gui to mpv. - -Xt7-Player-mpv aims to be an (in)complete graphical interface -to mpv, focused on usability. - -It also provides extra features like youtube and shoutcast integration, dvbt, -media tagging, library and playlist managment and a lot more. -Visit: http://xt7-player.sourceforge.net/xt7forum/viewtopic.php?f=4&t=2 -for a screenshots tour. - -It is written and requires (the latest) Gambas3: -http://gambas.sourceforge.net/en/main.html - - -Mandatory requirements: ------------------------------ - * Gambas 3 (usually the very latest version) - * Qt4 - * mpv - - - -Optional requirements: ------------------------------ - * taglib to tag audio files and speed-up library syncronization: - http://developer.kde.org/~wheeler/taglib.html - - * xbindkeys: to use global hotkeys - http://hocwp.free.fr/xbindkeys/ - - * scan and femon from LinuxTV dvb-apps to use dvbt features - http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps - - * youtube-dl to watch and download youtube videos - http://rg3.github.com/youtube-dl/ - - - -Compiling it: ------------------------------ -After you installed gambas 3, just checkout and compile xt7 that way: - -# git clone https://github.com/kokoko3k/xt7-player-mpv.git -# cd xt7-player-mpv/ -# /path/to/gambas/binaries/gbc3 -e -a -g -t -p -m -# /path/to/gambas/binaries/gba3 -# ./xt7-player-mpv.gambas - -
View file
xt7-player-mpv-0.16.384.tar.gz/.project -> xt7-player-mpv-0.18.384.tar.gz/.project
Changed
@@ -3,7 +3,7 @@ Title=xt7-player Startup=StartClass Icon=xt7-player-mpv.png -Version=0.16.384 +Version=0.18.384 Component=gb.args Component=gb.image Component=gb.qt4
View file
xt7-player-mpv-0.16.384.tar.gz/.settings -> xt7-player-mpv-0.18.384.tar.gz/.settings
Changed
@@ -511,7 +511,7 @@ Geometry=[1280,0,224,280] [DebugWindow/MyGrid] -Geometry=[51,41,344,344] +Geometry=[849,571,344,344] [DebugWindow/MyGrid.Data.Picture] Geometry=[48,-4,210,210] @@ -742,7 +742,7 @@ Geometry=[0,0,344,344] [DebugWindow/SortTable] -Geometry=[11,111,522,603] +Geometry=[-575,540,878,775] [DebugWindow/SourceList] Geometry=[0,41,344,344] @@ -1594,7 +1594,7 @@ Geometry=[47,0,210,210] [DebugWindow/i] -Geometry=[1280,-3,210,446] +Geometry=[1280,-3,224,446] [DebugWindow/i.Load(tmpdir & Dir(tmpdir, "*.jpg*")[0])] Geometry=[1280,-3,210,210] @@ -1770,6 +1770,9 @@ [DebugWindow/mplayer.cddbtracks] Geometry=[48,-4,410,672] +[DebugWindow/mplayer.watched_properties_old_data] +Geometry=[45,-3,224,280] + [DebugWindow/mplayertag] Geometry=[44,-3,734,731] @@ -2383,6 +2386,9 @@ [DebugWindow/vsplit1.layout] Geometry=[0,-3,224,280] +[DebugWindow/watched_properties_old_data] +Geometry=[45,-3,224,280] + [DebugWindow/xbindkeys] ShowHidden=True Geometry=[0,0,344,344] @@ -2442,65 +2448,74 @@ [OpenFile] File[1]=".src/Form/FMain.form" -File[2]=".src/Form/FMain.class:0.7311" -Active=5 -Count=58 +File[2]=".src/Form/FMain.class:36.524" +Active=67 +Count=67 File[3]=".src/Form/HotKeys.form" -File[4]=".src/Form/HotKeys.class:7.406" +File[4]=".src/Form/HotKeys.class:11.486" File[5]=".src/Form/GeneralOptions.form" -File[6]=".src/Form/GeneralOptions.class:10.1004" -File[7]=".src/0_Moduli/Global.module:14.1182" +File[6]=".src/Form/GeneralOptions.class:15.445" +File[7]=".src/0_Moduli/Global.module:40.64" File[8]=".src/Form/AddUriForm.form" File[9]=".src/Form/AddUriForm.class:2.58" File[10]=".src/Form/RealtimeForm.form" File[11]=".src/Form/DVBTuner.form" -File[12]=".src/Form/DVBTuner.class:2.67" +File[12]=".src/Form/DVBTuner.class:11.442" File[13]=".src/Form/EpgForm.form" -File[14]=".src/Form/CoverManager.class:12.1178" +File[14]=".src/Form/CoverManager.class:29.1246" File[15]=".src/Form/NewChains.form" -File[16]=".src/Form/NewChains.class:0.393" -File[17]=".src/Classi/MplayerClass.class:89.1016" -File[18]=".src/Classi/MplayerClass_old.class:22.1240" +File[16]=".src/Form/NewChains.class:49.159" +File[17]=".src/Classi/MplayerClass.class:11.1592" +File[18]=".src/Classi/MplayerClass_old.class:22.1707" File[19]=".src/Form/OpenSubtitesForm.class:55.19" File[20]=".src/Form/OpenSubtitesForm.form" -File[21]="AA_ToDo:80.837" +File[21]="AA_ToDo:103.769" File[22]=".src/Form/ladspahelper.class:22.194" File[23]=".src/Form/HotKeyGrab.form" File[24]=".src/Form/HotKeyGrab.class:2.28" File[25]="CHANGELOG_GIT:48.161" -File[26]=".src/Classi/StartClass.class:1.46" +File[26]=".src/Classi/StartClass.class:15.40" File[27]=".src/0_Moduli/HotKeysHelper.module:19.185" File[28]=".src/Form/ladspahelper.form" File[29]=".src/Form/FormLyrics.class:26.213" File[30]=".src/Classi/TagLib.class:0.88" -File[31]=".src/Classi/PlaylistClass.class:28.1170" +File[31]=".src/Classi/PlaylistClass.class:22.847" File[32]=".src/Form/FormLyrics.form" File[33]=".src/Form/FsForm.form" File[34]=".src/Form/FsForm.class:0.18" -File[35]=".src/0_Moduli/MyDialog.class:0.5" -File[36]=".src/Classi/SettingsClass.class:492.14" +File[35]=".src/0_Moduli/MyDialog.class:26.102" +File[36]=".src/Classi/SettingsClass.class:26.572" File[37]="FakeInput.conf:8.279" -File[38]=".src/Form/zzzFake.class:18.49" +File[38]=".src/Form/zzzFake.class:0.58" File[39]=".src/Form/zzzFake.form" -File[40]=".src/Classi/randr.class:0.2" +File[40]=".src/Classi/randr.class:6.149" File[41]=".src/Form/AudioConvert.form" File[42]=".src/Form/AudioConvert.class:30.121" File[43]=".src/Classi/YoutubeClass.class:30.674" File[44]=".src/Classi/ShoutCastClass.class:38.334" -File[45]=".src/Classi/IceCastClass.class:0.29" +File[45]=".src/Classi/IceCastClass.class:15.30" File[46]=".src/Form/MyQuestion.class:0.79" -File[47]=".src/Classi/WgetClass.class:24.25" +File[47]=".src/Classi/WgetClass.class:25.65" File[48]=".src/Form/TextDialog.form" File[49]=".src/Form/LogWindow.form" File[50]=".src/Form/AudioForm.form" -File[51]=".src/Form/AudioForm.class:26.234" +File[51]=".src/Form/AudioForm.class:32.349" File[52]=".src/Classi/VSlider.class:25.17" -File[53]=".src/Classi/Meters.class:16.94" +File[53]=".src/Classi/Meters.class:16.197" File[54]="shade_alpha.png" File[55]=".src/Form/OverlayTrayTip.class:15.125" File[56]="3dglassess.png" File[57]=".src/Classi/dvbsnoop_class.class:20.84" File[58]=".src/0_Moduli/ComboHistory.module:0.34" +File[59]=".src/Classi/FloatSpinBox.class:23.36" +File[60]=".src/Classi/LibVisualClass.class:0.0" +File[61]=".src/Form/SubAndOsd.form" +File[62]="00_note:59.111" +File[63]=".src/Classi/AlbumView.class:15.251" +File[64]=".src/Form/EpgForm.class:11.38" +File[65]=".src/Form/TranslationNeeded.class:0.18" +File[66]=".src/Classi/OpenSubtitlesAPI.class:28.23" +File[67]=".src/Form/SubAndOsd.class:9.148" [Watches] Count=6
View file
xt7-player-mpv-0.16.384.tar.gz/.src/0_Moduli/Global.module -> xt7-player-mpv-0.18.384.tar.gz/.src/0_Moduli/Global.module
Changed
@@ -65,6 +65,7 @@ Public arg_append As Boolean = False 'cmdline argument: the user want to append an uri to a running instance Public arg_debug As Boolean = False Public arg_new_instance As Boolean = False +Public arg_start_tray As Boolean = False Public Sub init() 'FixFormNames() 'needed with gambas 3.4.1; form names arent set by default! @@ -292,13 +293,14 @@ End Public Function IsPlaylist(filename As String) As Boolean - If ((filename Like "*.pls") Or (filename Like "*.pls\\?*")) Then Return True - If ((filename Like "*.m3u") Or (filename Like "*.m3u\\?*")) Then Return True - If ((filename Like "*.asx") Or (filename Like "*.asx\\?*")) Then Return True - If ((filename Like "*.wax") Or (filename Like "*.wax\\?*")) Then Return True - If ((filename Like "*.wvx") Or (filename Like "*.wvx\\?*")) Then Return True - If ((filename Like "*.ram") Or (filename Like "*.ram\\?*")) Then Return True - If ((filename Like "*.b4s") Or (filename Like "*.b4s\\?*")) Then Return True + Dim lfilename As String = Lower(filename) + If ((lfilename Like "*.pls") Or (lfilename Like "*.pls\\?*")) Then Return True + If ((lfilename Like "*.m3u") Or (lfilename Like "*.m3u\\?*")) Then Return True + If ((lfilename Like "*.asx") Or (lfilename Like "*.asx\\?*")) Then Return True + If ((lfilename Like "*.wax") Or (lfilename Like "*.wax\\?*")) Then Return True + If ((lfilename Like "*.wvx") Or (lfilename Like "*.wvx\\?*")) Then Return True + If ((lfilename Like "*.ram") Or (lfilename Like "*.ram\\?*")) Then Return True + If ((lfilename Like "*.b4s") Or (lfilename Like "*.b4s\\?*")) Then Return True Return False End
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Classi/AlbumView.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Classi/AlbumView.class
Changed
@@ -249,7 +249,7 @@ 'Endif coverfile = CoverManager.Coverfile(artist, album, path) - If Not Exist(coverfile) 'se il coverfile non esiste + If Not Exist(coverfile, True) 'se il coverfile non esiste If CoverManager.IsUncovered(path) Then '...e non può essesere creato/caricato view.Data.Picture = CoverManager.coverpicture(coverfile, path, iconsize) 'ritorna quello di default Else
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Classi/MplayerClass.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Classi/MplayerClass.class
Changed
@@ -136,6 +136,7 @@ properties.add("track-list/" & T & "/lang") properties.add("track-list/" & T & "/type") properties.add("track-list/" & T & "/codec") + properties.add("track-list/" & T & "/selected") Next 'T properties.Add("vo-configured") @@ -306,7 +307,7 @@ Dim chans As String[] Dim chansfix As New String[] Dim chanfile As String = User.home & "/.config/mpv/channels.conf.ter" - If Not (Exist(chanfile)) Then Return 0 + If Not (Exist(chanfile, True)) Then Return 0 chans = Split(file.Load(chanfile), "\n") For i = 0 To chans.Max 'we have to discard any non valid channel line, because so does mplayer @@ -513,39 +514,38 @@ Public event_loop As Timer -Public watched_properties As New String[] -Public watched_properties_old_data As New String[] +Public watched_properties_old_data As New Collection 'name holds property name, data holds old data value Public Sub event_loop_timer() '* generate events on property changes '* keep properties updated Dim name, data_new, data_old As String - Dim i As Integer + Dim watched_properties As New String[] + + For Each data_old In watched_properties_old_data + watched_properties.Add(watched_properties_old_data.key) + Next If watched_properties.count > 0 Then get_properties_mpv(watched_properties, False) 'async ask for those properties Wait 0.1 'see if some property has changed: - For i = 0 To watched_properties.count - 1 - - name = watched_properties[i] + For Each data_old In watched_properties_old_data + name = watched_properties_old_data.Key data_new = getP(name) - data_old = watched_properties_old_data[i] - If data_old <> data_new Then Raise property_change(name, data_old, data_new) - watched_properties_old_data[i] = data_new + watched_properties_old_data[name] = data_new Endif Next Endif - - End Event property_change(name As String, data_old As String, data_new As String) Event seeking() + Private Function internal_options() As Collection Dim out As New Collection @@ -615,7 +615,7 @@ Shell killer_script & " " & Application.id & " " & playerprocess.id global.myDebug(killer_script & " " & Application.id & " " & playerprocess.id) - watched_properties_old_data.Resize(watched_properties.count) + event_loop = New Timer As "event_loop" event_loop.delay = 500 event_loop.start @@ -724,7 +724,6 @@ Dim properties As String[] Dim cuetext As String Dim fullpath As String - fullpath = getP("fullpath") If fullpath = "" Then Return @@ -756,7 +755,6 @@ FillMultitracks(force_audio_only) 'will set prop[audioonly] too. Try setP("size", (Stat(fullpath, True).Size Div 1024)) - properties = New String[] properties.insert(["filename", "partially-seekable", "file-format", "audio-codec"]) 'common 'properties.Insert(["=audio-bitrate", "audio-channels", "=audio-channels", "=audio-samplerate"]) 'common @@ -1127,7 +1125,7 @@ mpv_command(["no-osd", "screenshot_to_file", picfile, "video"]) - While Not Exist(picfile) 'wait for mplayer answer + While Not Exist(picfile, True) 'wait for mplayer answer Wait 0.05 timeout = timeout - 1 Wend @@ -1382,7 +1380,7 @@ Public Sub thumbprocess_kill() Try Copy outdirpriv & "/" & Dir(outdirpriv, "*")[0] To newfilenamepriv Shell "rm -R " & outdirpriv & "&>/dev/null" - If Exist(newfilenamepriv) Then + If Exist(newfilenamepriv, True) Then Raise ThumbAvailableFor(Thumbfullpathpriv, gridpriv, rowpriv, columnpriv) Else If ShortMovieChecked Then @@ -1491,7 +1489,7 @@ 'wait for pic timeout = 100 - If Not Exist(tmpdir) Then Goto lStart + If Not Exist(tmpdir, True) Then Goto lStart While Dir(tmpdir, "*.png").count = 0 And (timeout > 0) And mpanalyze.state = Process.Running Wait 0.01 timeout -= 1 @@ -1514,7 +1512,7 @@ Try cTimei = Split(cTime, ".")[0] Try cTimef = Split(cTime, ".")[1] Try t = tmpdir & Dir(tmpdir, "*.png")[0] - If Exist(t) Then + If Exist(t, True) Then Try i = i.Load(tmpdir & Dir(tmpdir, "*.png")[0]) 'Shell "mv " & (tmpdir & Dir(tmpdir, "*.jpg")[0]) & " /tmp/tmp/" & ctime & ".jpg" Wait If Not Error Then @@ -1849,7 +1847,6 @@ For Each name In names p = getP(name) p_timestamp = getP_time(name) - Debug p_timestamp If wait_unavailable Then If (p_timestamp > time_zero) And (p <> unavailable_str) Then names.Remove(names.Find(name)) Else
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Classi/MplayerClass_old.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Classi/MplayerClass_old.class
Changed
@@ -568,7 +568,7 @@ Random1 = Int(Rnd(0, 65535)) Try Mkdir global.confpath & "/.InputPipes" inputpipe = global.confpath & "/.InputPipes/Xt7Input-" & Random1 - If Exist(inputpipe) Then Shell "rm '" & inputpipe & "'" Wait + If Exist(inputpipe, True) Then Shell "rm '" & inputpipe & "'" Wait Shell "mkfifo " & inputpipe Wait 'SLEEP 1 End @@ -1581,7 +1581,7 @@ Public Sub thumbprocess_kill() Try Copy outdirpriv & "/" & Dir(outdirpriv, "*")[0] To newfilenamepriv Shell "rm -R " & outdirpriv & "&>/dev/null" - If Exist(newfilenamepriv) Then + If Exist(newfilenamepriv, True) Then Raise ThumbAvailableFor(Thumbfullpathpriv, gridpriv, rowpriv, columnpriv) Else If ShortMovieChecked Then @@ -1686,7 +1686,7 @@ 'wait for pic timeout = 100 - If Not Exist(tmpdir) Then Goto lStart + If Not Exist(tmpdir, True) Then Goto lStart While Dir(tmpdir, "*.jpg").count = 0 And (timeout > 0) And mpanalyze.state = Process.Running Wait 0.01 timeout -= 1 @@ -1705,7 +1705,7 @@ Try cTimei = Split(cTime, ".")[0] Try cTimef = Split(cTime, ".")[1] Try t = tmpdir & Dir(tmpdir, "*.jpg")[0] - If Exist(t) Then + If Exist(t, True) Then Try i = i.Load(tmpdir & Dir(tmpdir, "*.jpg")[0]) 'Shell "mv " & (tmpdir & Dir(tmpdir, "*.jpg")[0]) & " /tmp/tmp/" & ctime & ".jpg" Wait If Not Error Then
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Classi/OpenSubtitlesAPI.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Classi/OpenSubtitlesAPI.class
Changed
@@ -21,7 +21,7 @@ timeout -= 1 Wend If timeout = 0 Then Return "-1" - If Exist(Responsefile) Then + If Exist(Responsefile, True) Then answer = Trim(File.Load(responsefile)) Endif Return File.Load(Responsefile)
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Classi/PlaylistClass.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Classi/PlaylistClass.class
Changed
@@ -407,6 +407,7 @@ Dim i, r As Integer Dim layout As String = "Layout" Dim MyFile As File + Try Copy filename To filename & ".bak" Myfile = Open filename For Write Create 'write table layout For i = 0 To mygrid.Columns.Count - 1 @@ -417,6 +418,7 @@ Print #Myfile, Table[r] Next 'c Close #MyFile + End @@ -838,7 +840,7 @@ - If Exist(dirtoadd) And (Not MatchExcluded) Then + If Exist(dirtoadd, True) And (Not MatchExcluded) Then For Each filename In Dir(DirToAdd).Sort() If Right(DirToAdd) <> "/" Then DirToadd = DirToAdd & "/" MyExist = True @@ -862,7 +864,6 @@ End - Public Sub SyncSortedTable() 'Will fill SortTable with Full paths from ptable 'and sort it to allow fast searches for duplicates through function IsDupe() @@ -870,10 +871,8 @@ 'DIM starttime AS Date = Now 'DIM endtime AS Date - Dim i As Integer - Dim Field As String = "Full Path" SortTable.clear 'PRINT "Debug: playlistclass syncsorttable() start at: " & Time @@ -885,7 +884,17 @@ SortTable.Add(GetValue(Ptable[i], Field)) Next 'i ' [GB2:TEXT] SortTable = SortTable.Sort(gb.text) - SortTable = SortTable.Sort(gb.language) + + Try SortTable = SortTable.Sort(gb.language) + If Error Then + Debug "SortTable.Sort(gb.language) failed." + Debug "Some filename is using a wrong charset," + Debug "Failing back to Mergesort with comparison error handling," + Debug "but this may be inaccurate and lead to wrong search results." + Debug "You are STRONGLY advised to fix your filenames." + sorttable = mergesort(SortTable) + Endif + 'PRINT "Debug: playlistclass syncsorttable() end at: " & Time 'endtime = Now @@ -893,6 +902,63 @@ End + +Private Function MergeSort(aArray As String[]) As String[] + 'override for builtin gambas sort function with + 'error check on comparison functions + 'uses mergesort. + + Dim aA, aB As String[] + Dim iI As Integer = 0, iJ As Integer = 0, iK As Integer = 0 + Dim iMid As Integer + + ' Trivial case + If aArray.Count = 1 Then Return aArray + ' Split + iMid = aArray.Count / 2 + aA = MergeSort(aArray.Copy(0, iMid)) + aB = MergeSort(aArray.Copy(iMid, aArray.Count - iMid)) + ' Merge. We reuse the space in aArray to save the sorted array + While iI < aA.Count And iJ < aB.Count + 'If aA[iI] <= aB[iJ] Then + If FirstIsEqualLess(aA[iI], aB[iJ]) Then + aArray[iK] = aA[iI] + Inc iI + Else + aArray[iK] = aB[iJ] + Inc iJ + Endif + Inc iK + Wend + If iI = aA.Count Then ' Put the non-consumed array into aA + aA = aB + iI = iJ + Endif + While iI < aA.Count + aArray[iK] = aA[iI] + Inc iI + Inc iK + Wend + Return aArray +End + +Public Sub FirstIsEqualLess(a As String, b As String) As Boolean + Dim out As Boolean = True + Try out = Comp(a, b, gb.language) <= 0 + If Error Then + Debug "Error while comparing strings, with gb.language", a, b + Try out = Comp(a, b, gb.natural) <= 0 + If Error Then + Debug "Error while comparing strings, with gb.natural", a, b + Try out = Comp(a, b, gb.binary) <= 0 + If Error Then Debug "Error while comparing strings, with gb.binary, giving up.", a, b + Endif + Endif + Return out +End + + + Private Function BinarySearch(item As String) As Integer Dim first, Tlast, middle As Integer @@ -1484,6 +1550,7 @@ 'find the maximum Gambas column width For TextW = 3000 DownTo 0 Step 4 Try MyGrid.Columns[0].w = TextW + If Error Then Return If MyGrid.Columns[0].w = TextW Then Break Next maxgbw = TextW
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Classi/SettingsClass.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Classi/SettingsClass.class
Changed
@@ -15,7 +15,7 @@ Public ExcludedValues As String[] = ["thumblebox", "NumberBox", "View", "Statusbar1", "SeekBar", "TagPanel", "DriverDescription", "DescriptionArea", "FilterTextBox", "NOPARSETABLIBRARY", "NOPARSETABALBUMS", "NOPARSETABBROWSE", "NOPARSETABPLAYLIST", "NOPARSETABCHAPTERS", "NOPARSETABFLASH", "NOPARSETABSHOUTCAST", "NOPARSETABPODCAST", "NOPARSETABDVB", "NOPARSETABCDDA", "NOPARSETABDVD", "NOPARSETABPROFILES", "NOPARSETABMEDIAINFO", "YOUVIDEOINFO", "SCROLLVIEWYT", "SIDEPANELYOUTUBE", "CACHEBAR", "NOSAVEVBOX2", "NOSAVEVBOX3", "NOSAVEHBOX10", "AUDIOCHAINBOX", "AUDIOFILTERSBOX", "VIDEOCHAINBOX", "VIDEOFILTERSBOX", "PLAYLISTSELINFOBOX", "PLAYLISTSELINFO", "LIBRARYSELINFO", "BUTTON_SHOW_MAN", "HELPBOX", "TEXTAREAHELP", "NOSAVELABEL1", "filter_button_up", "filter_button_down"] Public Function ReadedConfFile(FileName As String) As String[] - If Exist(FileName) Then Return Split(File.Load(filename), "\n", "", True) + If Exist(FileName, True) Then Return Split(File.Load(filename), "\n", "", True) 'else Return [""] End @@ -27,7 +27,7 @@ Dim FileInMemory As String Dim Splitted As New String[] - If Exist(FileName) Then + If Exist(FileName, True) Then ConfFile = Open FileName For Read Read #ConfFile, FileInMemory, - Stat(FileName).size Close #ConfFile @@ -276,7 +276,7 @@ 'Filename is the form setting file '/home/user/.config/gambas/Xt7-Player/default.profile/FMain FileName = Filename & ".profile/" & TheForm.name - + theSettings = ReadedConfFile(Filename) For i = 0 To thesettings.Max @@ -457,7 +457,7 @@ Dim i As Integer Dim tmp As String - If Exist(myfilename) Then + If Exist(myfilename, True) Then myfile = Open myfilename For Read For i = 0 To FMain.LeftSideTabs.count - 1 Try Line Input #myfile, tmp
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Classi/WgetClass.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Classi/WgetClass.class
Changed
@@ -27,7 +27,7 @@ Try out = File.Load(tmpfile) Endif tries = tries - 1 - If Exist(tmpfile) Then + If Exist(tmpfile, True) Then If (Stat(tmpfile).size > 0) Then wgetdone = True Endif 'UNTIL ((tries = 0) OR (Stat(tmpfile).size > 0)) @@ -63,7 +63,7 @@ While (ProcessRunningOvr(wgetprocess2)) Wait 0.05 Wend - If Exist(tmpfile) Then + If Exist(tmpfile, True) Then If (Stat(tmpfile).size > 0) Then wgetdone = True Endif Until ((tries = 0) Or wgetdone)
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/AudioForm.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/AudioForm.class
Changed
@@ -388,10 +388,7 @@ leftalignup.w = (AudioPanel.w - Max(upwidth, downWidth)) Div 2 leftaligndown.w = leftalignup.w - ' audioform.GridDown.Columns[0].w = -1 - ' audioform.GridDown.Columns[1].w = -1 - ' audioform.GridUp.Columns[0].w = -1 - ' audioform.GridUp.Columns[1].w = -1 + End Public Sub UpdateCell(g As Gridview, row As Integer, column As Integer, t As String)
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/AudioForm.form -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/AudioForm.form
Changed
@@ -48,6 +48,10 @@ Alignment = Align.Center } } + { TimerZoomOut #Timer + #Move(140,63) + Delay = 30 + } { GridUp GridView audioareagroup Name = "GridUp" Move(189,14,364,133) @@ -57,12 +61,8 @@ ScrollBar = Scroll.None AutoResize = False } - { TimerZoomOut #Timer - #Move(210,56) - Delay = 30 - } { GridUpShadow GridView - Move(217,28,364,100) + Move(301,7,364,100) Background = &HFF000000& Border = False Grid = False @@ -72,7 +72,7 @@ } { Panel1 Panel audioareagroup Name = "Panel1" - Move(35,210,588,150) + Move(28,196,588,150) Arrangement = Arrange.Horizontal AutoResize = True Spacing = True @@ -82,7 +82,7 @@ Tracking = True } { GridDownShadow GridView - Move(21,0,504,56) + Move(42,-7,504,56) Background = &HFF000000& Border = False Grid = False @@ -91,7 +91,7 @@ } { GridDown GridView audioareagroup Name = "GridDown" - Move(77,0,504,50) + Move(133,14,504,50) Background = &HFF000000& Border = False Grid = False @@ -108,7 +108,7 @@ } { PictureBack PictureBox AudioAreaGroup Name = "PictureBack" - Move(406,63,231,63) + Move(315,84,231,63) Tracking = True Drop = True Expand = True @@ -117,7 +117,7 @@ } } { TimerZoomIn #Timer - #Move(182,161) + #Move(49,154) Delay = 30 } }
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/CoverManager.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/CoverManager.class
Changed
@@ -385,14 +385,14 @@ Return cornice(Stock[CStr(height + shadowoffset) & "/video"].Image, neww) Endif -If Exist(coverfile) Then +If Exist(coverfile, True) Then Try Return CoverCacheList[cachefile].picture 'Se esiste l 'immagine in memoria dai l 'immagine in memoria ed esci If Error Then 'Se non esiste l 'immagine in memoria, allora - If Exist(cachefile) Then 'Se esiste una cache su disco allora + If Exist(cachefile, True) Then 'Se esiste una cache su disco allora Try CoverCacheList.Add(cachefile, "", cornice(Shadowed(picture.Load(cachefile)), neww)) 'mettila IN memoria ************************************** If Not Error Then Return CoverCacheList[cachefile].picture 'ritornala Else 'Altrimenti(non esiste cache su disco) - If Exist(coverfile) 'se esiste la cover su disco, ma non la cache + If Exist(coverfile, True) 'se esiste la cover su disco, ma non la cache tmpimage = image.Load(coverfile) If (tmpimage.w < tmpimage.h) Then width = ((tmpimage.w / tmpimage.h) * height) @@ -979,7 +979,7 @@ picturebox1.refresh 'Me.show Wait 0.1 - If ((Not Exist(Coverfile(ArtistText.text, AlbumText.text))) And Not JustFileCover) Or forcesearch Then + If ((Not Exist(Coverfile(ArtistText.text, AlbumText.text), True)) And Not JustFileCover) Or forcesearch Then Try search() 'start a fetch Endif Endif @@ -1039,7 +1039,7 @@ Return Else 'file not (yet?) marked as not found If Not global.IsNetworkURI(fullpath) Then - If Not Exist(fullpath) Then + If Not Exist(fullpath, True) Then global.myDebug("Missing file! " & fullpath) FileNotFoundAdd(fullpath) 'mygrid[row, 0].picture = picture["icon:/" & (rowheight -global.rowpadding) & "/error"] @@ -1244,7 +1244,7 @@ Wait 0.05 Wend If FMain.closing Then Return - If Exist(coverfilepath) Then Return + If Exist(coverfilepath, True) Then Return mplayerthumb = New Mplayerclass As "thumbnailer" runningthumblers += 1 global.myDebug(runningthumblers)
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/DVBTuner.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/DVBTuner.class
Changed
@@ -27,7 +27,7 @@ Scanexe = Trim(Scanexe) femonexe = Trim(femonexe) - If Not (Exist(Trim(scanexe)) And Exist(Trim(femonexe))) Then + If Not (Exist(Trim(scanexe), True) And Exist(Trim(femonexe), True)) Then errmessage = errmessage & "Sorry, cannot find 'scan' and/or 'femon'\n" errmessage = errmessage & "\n" errmessage = errmessage & "Fill scan and femon executables fields\n" @@ -409,8 +409,8 @@ mplayerchannelsfilebak = mplayerchannelsfile & ".prext7" 'mplayer doesn't support to specify an alternative channels file, so 'we backup an existing one and populate it again with our values - If (Not Exist(mplayerchannelsfilebak)) Then - If Exist(mplayerchannelsfile) Then + If (Not Exist(mplayerchannelsfilebak, True)) Then + If Exist(mplayerchannelsfile, True) Then Try Copy mplayerchannelsfile To mplayerchannelsfilebak If Not Error Then displayinfo = True @@ -440,7 +440,7 @@ End Public Sub selecttuning() - If Exist("/usr/share/dvb/dvb-t") Then myDialog.Path = "/usr/share/dvb/dvb-t/" + If Exist("/usr/share/dvb/dvb-t", True) Then myDialog.Path = "/usr/share/dvb/dvb-t/" myDialog.OpenFile() ftablefilesource = myDialog.Path Me.Caption = "Tuning Data file: " & File.Name(ftablefilesource)
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/FMain.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/FMain.class
Changed
@@ -235,7 +235,7 @@ Public SwitchingFullScreen As Boolean = False 'Private UserStopped As Boolean = False 'if user has hit stop, don't advance in playlist. -Private FirstPlay As Boolean = False ' used to avoid playing the media at startup if togglepls button is toggled +Public FirstPlay As Boolean = False ' used to avoid playing the media at startup if togglepls button is toggled Public LastDvdID As String = "" 'used to manage dvd disk changes @@ -442,6 +442,7 @@ global.initearlyformsdone = True SubAndOsd.Init() GeneralOptions.Init() + generaloptions.BackColorChooseBTN2.background = Color.Merge(Color.TextBackground, Color.black, 0.1) Try Last.mouse = mouse.default fmain.mouse = mouse.default global.myDebug("Ends at:" & Time) @@ -452,6 +453,9 @@ Public Sub AllInit_Post() Dim cscreen As Screen Dim savefileview1path As String + If Not Panel2.visible Then Panel2.visible = True + If MyLibraryProgressBar.visible Then MyLibraryProgressBar.visible = False + Hsplit1ResizeDelayed = New Timer As "Hsplit1ResizeDelayed" 'used to delay the hsplit resize and better performance Hsplit1ResizeDelayed.delay = 300 Hsplit1ResizeDelayed.Enabled = False @@ -507,7 +511,13 @@ Try HotKeys.LoadHotKeys(global.confpath & "/" & global.CurrentProfile) Try UpdateProfilesTabList() UpdateMenuTabVisibility() - If GeneralOptions.TrayCHK1.value Then Try InitTrayIcon() + If (GeneralOptions.TrayCHK1.value) Or global.arg_start_tray Then Try InitTrayIcon() + If global.arg_start_tray Then + If desktop.HasSystemTray Then + fmain.Minimized = True + fmain.SkipTaskbar = True + Endif + Endif If TabSelectedShoutcast() Then ShoutCast_Select() Else If TabSelectedLibrary() Then @@ -533,7 +543,7 @@ Endif If global.arg_file <> "" Then - If Exist(global.arg_file) Then fmain.ShowBrowseTabTo(global.arg_file) + If Exist(global.arg_file, True) Then fmain.ShowBrowseTabTo(global.arg_file) Endif If GeneralOptions.ToolTipsCHKDBUS.value Then Try ExportDbusProperties() updaterecentfiles() @@ -894,7 +904,6 @@ Dim Userfont As Font = GeneralOptions.FontChooseBTN1.font Dim i As Integer - If GeneralOptions.HideTabTextCHK.value Then For i = 0 To Leftsidetabs.Count - 1 leftsidetabs[i].text = "" @@ -1018,6 +1027,10 @@ GenresTree.Foreground = forecolor GenresTree.Background = backcolor + ShutResultGrid.font = userfont + ShutResultGrid.Foreground = forecolor + ShutResultGrid.Background = backcolor + PodcastTree.font = Userfont PodcastTree.Foreground = forecolor PodcastTree.Background = backcolor @@ -1099,6 +1112,8 @@ Public havetoshowbrowsetab As Boolean = False Private PlayFromCommandline As Boolean = False +Private timer_delay_play As Timer + Public Sub MainInit() Dim AlreadyRunning As Boolean = False @@ -1109,7 +1124,7 @@ FirstTimeXt7 = Not (Exist(global.ConfPath)) ShutOff_Click() MakeProfilePath() - + Try Shell "mkdir -p " & Global.ScreenshotFolder & " >/dev/null 2>&1" Wait Try Mkdir User.home & "/.config/mpv/" covermanager.MakeCoverDirs() @@ -1138,6 +1153,7 @@ If global.CurrentProfile = "" Then global.CurrentProfile = "default" If (Not global.initearlyformsdone) Then InitEarlyForms() + ReallySaveAllSettings(global.currentprofile, False) 'before loading user settings, make a profile with factory values. global.myDebug("Made a new profile: '" & global.CurrentProfile & "' as a copy of the factory default one") @@ -1148,9 +1164,9 @@ Try UpdateProfilesTabList() - If (global.arg_file <> "") Then + AllInit_pre() - AllInit_pre() + If (global.arg_file <> "") Then FirstPlay = True 'used to avoid playing media at start when togglepls button is toggled Me.mouse = mouse.Wait @@ -1160,17 +1176,23 @@ If (Not global.arg_append) And (global.arg_file <> "") Then Media_Next_path = DConv(global.arg_file) PlayFromCommandline = True - If Exist(DConv(global.arg_file)) Then SetActivePlayQueue("browse") - Play(DConv(global.arg_file)) + If Exist(DConv(global.arg_file), True) Then SetActivePlayQueue("browse") + If global.IsPlaylist(global.arg_file) Then + timer_delay_play = New Timer As "timer_delay_play" + timer_delay_play.delay = 100 + timer_delay_play.Start() + Else + Play(DConv(global.arg_file)) + Endif + Endif Me.Mouse = mouse.Default havetoshowbrowsetab = True Else - AllInit_pre() FMain.LoadFormGeometry() - fmain.Show + If Not global.arg_start_tray Then fmain.Show Endif DelayTimer.delay = 1000 @@ -1184,6 +1206,18 @@ End +Public Sub timer_delay_play_Timer() + + If Not fmain.FullyLoaded Then Return + timer_delay_play.stop + Play(DConv(global.arg_file)) + + 'hacky. + audioform.AutoresizeAudioForm() +End + + + Public Sub ShowBrowseTabTo(fullpath As String) Dim path As String @@ -1272,6 +1306,7 @@ Dim cTime As Integer = 0 Dim audio_codec As String = "" Dim chapter As Integer + Dim tracklist_current_audio As Integer = 0 If Not mplayer.ProcessRunningOvr() Then Return @@ -1288,7 +1323,9 @@ PropertiesGrid[12, 1].text = mplayer.getP("=audio-params/channels") PropertiesGrid[13, 1].text = mplayer.getP("=audio-params/samplerate") - PropertiesGrid[14, 1].text = mplayer.getP("audio-codec") + 'PropertiesGrid[14, 1].text = mplayer.getP("audio-codec") + Try tracklist_current_audio = mplayer.getP("tracklist-current-audio") + PropertiesGrid[14, 1].text = mplayer.getP("track-list/" & tracklist_current_audio & "/codec") 'Try PropertiesGrid[15, 1].text = (CInt(mplayer.get_property_mpv("=audio-bitrate")) Div 1000) & "Kbps" Try PropertiesGrid[15, 1].text = mplayer.get_property_mpv("audio-bitrate") @@ -1404,7 +1441,7 @@ Try Shell "rm -R " & global.ConfPath & "/" & "thumbcontainer.* &>/dev/null" StartClass.ProcessSignals(False) - If buttoncapture.value Then StopDumping(generaloptions.dvbfinaldir.text) + If buttoncapture.value Then StopDumping() Try Unlock hLock Repeat @@ -1566,13 +1603,15 @@ Dim dH As Integer = 3 Dim AR As Float = 1.333 Dim ARv As Float = videobox.w / videobox.h - Dim NoBarResize As Float + Dim f As Float + Dim videodisplay_w, videodisplay_h As Integer + Dim barsize As Integer + Dim NoBarResize, halfbarresize As Float Dim no_video As Boolean = True If zzzfake.YTPanel.Parent = outerbox Then YTPanel_myrefresh() - Try no_video = mplayer.getP("audioonly") If no_video Then Return @@ -1581,14 +1620,28 @@ If fmain.closing Then Return If global.IsImgFile(mplayer.getP("fullpath")) Then mplayer.do_seek(0) - Try dW = mplayer.getP("video-params/dw") - Try dH = mplayer.getP("video-params/dh") - AR = dW / dH + If ForcedAspectRT = "default" Then + Try dW = mplayer.getP("video-params/dw") + Try dH = mplayer.getP("video-params/dh") + AR = dW / dH + Else + Try AR = CFloat(ForcedAspectRT) + If Error Then AR = 16 / 9 + Endif + If AR > ARv Then - NoBarResize = (videobox.h / (VideoBox.w / AR)) - 1 - Else - NoBarResize = ((videobox.w / ar) / VideoBox.h) - 1 + videodisplay_w = videobox.w + videodisplay_h = videobox.w / AR + barsize = videobox.h - videodisplay_h + Try nobarresize = Log2((videobox.h / videodisplay_h)) + Try Halfbarresize = Log2(((barsize / 2) + videodisplay_h) / videodisplay_h) + Else + videodisplay_h = videobox.h + videodisplay_w = videobox.h * ar + barsize = videobox.w - videodisplay_w + Try nobarresize = Log2((videobox.w / videodisplay_w)) + Try Halfbarresize = Log2(((barsize / 2) + videodisplay_w) / videodisplay_w) Endif 'apply the zoom factor: @@ -1596,14 +1649,13 @@ Case "NOBARS" ResizeFactor = NoBarResize Case "HALFBARS" - ResizeFactor = NoBarResize / 2 + ResizeFactor = Halfbarresize End Select + Object.Lock(realtimeform.PanscanSlider) realtimeform.PanscanSlider.value = resizefactor * 10000 Object.unLock(realtimeform.PanscanSlider) - VideoBox.move(0, 0, outerbox.w, outerbox.h) - mplayer.set_property_mpv("video-zoom", Replace(CStr(resizefactor), ",", ".")) End @@ -1656,7 +1708,7 @@ Dim geometry As String Dim rx, ry, rw, rh As Integer - If Exist(myfilename) Then + If Exist(myfilename, True) Then myfile = Open myfilename For Read Try Line Input #myfile, geometry If Not Error Then @@ -1751,6 +1803,7 @@ Public Sub ButtonStop_Click() + ' Return ' Dim a As Integer = 1 / 0 'Stop @@ -1770,7 +1823,7 @@ previousfile_cover = "" videobox.cached = False zzzfake.PanelNowNext.visible = False - If buttoncapture.value Then StopDumping(generaloptions.dvbfinaldir.text) + If buttoncapture.value Then StopDumping() buttoncapture.enabled = False buttoncapture.visible = buttoncapture.enabled ABLoopButton.visible = False @@ -2678,8 +2731,6 @@ ' VideoBox.Visible = False - firstplay = False - ButtonPlay.enabled = False ' fixmempv @@ -2690,7 +2741,20 @@ ResizeFactor = 0 'LogWindow.streamtextbox.text = fullpath PrevValuecTime = 999999 - mplayer.watched_properties = ["pause", "volume", "=chapter", "=time-pos", "duration", "=duration", "percent-pos", "cache", "media-title"] + + mplayer.watched_properties_old_data.Add("", "pause") + mplayer.watched_properties_old_data.Add("", "volume") + mplayer.watched_properties_old_data.Add("", "=chapter") + mplayer.watched_properties_old_data.Add("", "=time-pos") + mplayer.watched_properties_old_data.Add("", "duration") + mplayer.watched_properties_old_data.Add("", "=duration") + mplayer.watched_properties_old_data.Add("", "percent-pos") + mplayer.watched_properties_old_data.Add("", "cache") + mplayer.watched_properties_old_data.Add("", "media-title") + mplayer.watched_properties_old_data.Add("", "=aid") + ' mplayer.watched_properties_old_data.Add("", "=vid") + ' mplayer.watched_properties_old_data.Add("", "=sid") + mplayer.clear_options() opts = static_options() For Each data In opts @@ -2889,6 +2953,7 @@ Endif ReturnLabel: + firstplay = False global.mouse_wait(fmain, False) switchresBTN.enabled = True Return True @@ -3246,7 +3311,7 @@ PreviousCoverFile = coverfile If Not (Exist(coverfile)) Then - If Exist(Trim(coverfile)) Then coverfile = Trim(coverfile) + If Exist(Trim(coverfile), True) Then coverfile = Trim(coverfile) Endif audioform.coverbox.refresh @@ -3283,6 +3348,7 @@ audioform.coverbox.refresh 'AlbumGridView.Current.Refresh() MyAlbumsLib.selectcell(AlbumGridView.Row, AlbumGridView.Column) + 'timerhideshowvideo.start End Public Function shadow(src As Image, final_size As Integer, offset As Integer) As Image @@ -3357,7 +3423,7 @@ audioform.refresh AudioForm.PictureBack.hide Endif - + End Public Sub SetChaptersTabVisibility(visibility As Boolean) @@ -3774,7 +3840,7 @@ Public Sub mplayer_property_change(name As String, data_old As String, data_new As String) If Not mplayer.ProcessRunningOvr() Then Return - + Select Case name Case "pause" @@ -3829,6 +3895,10 @@ Case Like "duration" UpdateStatusBar(CUSTOMTITLE_OLD, CTIME_OLD, CACHEVALUE_OLD) + Case "=aid" + global.myDebug("changed aid:", data_old, data_new) + mplayer.setP("tracklist-current-audio", TracklistCurrentAudioTrack()) + End Select Returnlabel: @@ -3836,6 +3906,22 @@ End +Public Function TracklistCurrentAudioTrack() As Integer + Dim n, t As Integer + Dim current_aid, id As String + Try t = mplayer.getP("track-list/count") + If Error Then Return + For n = 0 To t - 1 + If mplayer.get_property_mpv("track-list/" & n & "/type", True, 1, True) = "audio" Then + If mplayer.get_property_mpv("track-list/" & n & "/selected", True, 1, False) = "yes" Then + Return n + Endif + Endif + Next + Return 0 +End + + Public Sub Update_cache_percent(cachevalue As String) Dim percent_pos, percent_cache, duration, cache_duration_secs As Float duration = -1 @@ -3862,7 +3948,7 @@ SubNotSet = True If (Not mplayer.user_stopped) And (Shutdown = "MEDIA") Then CountDown.engage - If buttoncapture.value Then StopDumping(generaloptions.dvbfinaldir.text) 'fixmempv dumping + If buttoncapture.value Then StopDumping() 'fixmempv dumping buttoncapture.enabled = False buttoncapture.visible = buttoncapture.enabled ArrangeCpl() @@ -4295,7 +4381,7 @@ If SwitchingFullScreen Then Return If mouse.left Then GuiDragging = True - fmain.Move(fmain.screenx + (mouse.x - mouse.StartX), fmain.screeny + (mouse.y - mouse.Starty)) + fmain.Move(fmain.x + (mouse.x - mouse.StartX), fmain.y + (mouse.y - mouse.Starty)) Endif Else global.myDebug(" ") @@ -4382,7 +4468,7 @@ my = mouse.screeny If fullscreen Then - If Exist(fscommand) Then + If Exist(fscommand, True) Then global.myDebug("Executing " & fscommand & " " & fps) If Not mplayer.Paused() Then 'pause the video before swhitching fullscreen mplayer.do_pause() @@ -4406,7 +4492,7 @@ Endif 'if windowed - If Exist(windowcommand) Then + If Exist(windowcommand, True) Then global.myDebug("Executing " & windowcommand) If Not mplayer.Paused() Then 'pause the video before swhitching fullscreen mplayer.do_pause() @@ -6248,7 +6334,6 @@ Public Sub Hsplit1ResizeDelayed_timer() If Not fsform.fullscreen Then Hsplit1_MyRefresh - End Public Sub Hsplit1_MyRefresh() @@ -6264,8 +6349,6 @@ Update_cache_percent(mplayer.get_property_mpv("cache", True, 1, True)) Endif - - Try RightPanel = HSplit1.layout[1] If RightPanel < 10 Then OuterBox.Background = Me.Background @@ -6284,14 +6367,20 @@ toolbarbackground.show Endif YouVideoInfo.w = scrollviewyt.w - 64 - Try MyAlbumsLib.Arrange(generaloptions.IconWidthAlbums.text, albumviewtexlen) - + If TabSelectedAlbums() Then + Try MyAlbumsLib.Arrange(generaloptions.IconWidthAlbums.text, albumviewtexlen) + Endif + If zzzFake.PanelNowNext.visible Then Wait PanelNowNextArrange() Endif - If audioform.AudioPanel.Parent = outerbox Then audioform.AutoresizeAudioForm() + If audioform.AudioPanel.Parent = outerbox Then + audioform.AutoresizeAudioForm() + Endif + + End @@ -7107,7 +7196,7 @@ '--- If filefound Or (Lower(fullpath) Like "*dvb*://*") Then If GeneralOptions.ShowCoversInListChk.value Then 'the user want covers - If Not Exist(covermanager.Coverfile(artist, album, fullpath)) Then 'se il coverfile non esiste + If Not Exist(covermanager.Coverfile(artist, album, fullpath), True) Then 'se il coverfile non esiste If covermanager.IsUncovered(fullpath) Then '...e non puòessere creato MyGrid.Data.Picture = covermanager.coverpicture(covermanager.Coverfile(artist, album, fullpath), fullpath, (rowheight - rowpadding) * bigfactor) 'ritorna la coverdi Default Else 'il coverfile non esiste, ma potrebbe essere creato @@ -7135,6 +7224,8 @@ If row = hirow Then mygrid.Data.Font.bold = True MyGrid.data.text = MyLibrary.CellValue(MyGrid, row, column) + mygrid.Data.Foreground = GeneralOptions.ColorChooseBTN1.Background + End Public Sub OLD_Gridviews_Data(MyGrid As GridView, MyLibrary As Playlistclass, Row As Integer, Column As Integer) @@ -7195,7 +7286,7 @@ '--- If filefound Or (Lower(fullpath) Like "*dvb*://*") Then If GeneralOptions.ShowCoversInListChk.value Then 'the user want covers - If Not Exist(covermanager.Coverfile(artist, album, fullpath)) Then 'se il coverfile non esiste + If Not Exist(covermanager.Coverfile(artist, album, fullpath), True) Then 'se il coverfile non esiste If covermanager.IsUncovered(fullpath) Then '...e non puòessere creato MyGrid.Data.Picture = covermanager.coverpicture(covermanager.Coverfile(artist, album, fullpath), fullpath, (rowheight - rowpadding) * bigfactor) 'ritorna la coverdi Default Else 'il coverfile non esiste, ma potrebbe essere creato @@ -7226,9 +7317,7 @@ End Public Sub LibraryGrid_Data(Row As Integer, Column As Integer) - Gridviews_Data(LibraryGrid, mylibrary, Row, Column) - End Public Sub PlaylistGrid_Data(Row As Integer, Column As Integer) @@ -7845,7 +7934,7 @@ CoverManager.CachePicture.refresh CoverManager.Show() Wait 0.1 - If (Not Exist(CoverManager.Coverfile(CoverManager.ArtistText.text, CoverManager.AlbumText.text))) And Not JustFileCover Then + If (Not Exist(CoverManager.Coverfile(CoverManager.ArtistText.text, CoverManager.AlbumText.text), True)) And Not JustFileCover Then CoverManager.textbox1_Click() 'start a fetch Endif Endif @@ -7927,12 +8016,27 @@ Public Sub TrayIcon2_Scroll(Delta As Float, Orientation As Integer) If delta > 0 Then - volume_add("+2") + v = "UP" + 'volume_add("+2") Else + v = "DOWN" + 'volume_add("-2") + Endif + timervolume.Trigger() +End +Private v As String +Public Sub timervolume_Timer() + If v = "UP" Then + volume_add("+2") + Else volume_add("-2") Endif End + + + + Public Sub TrayIcon2_click() Dim iconified As Boolean = False iconified = (fmain.minimized And fmain.SkipTaskbar) @@ -10000,7 +10104,6 @@ Public Sub HSplit1_Resize() Dim prevlayout As Integer[] - bp.ignore = True bp.move(0, 0, outerbox.w, outerbox.h) bp.show @@ -10008,18 +10111,13 @@ videobox.hide thumblebox.hide - ' If Rnd(0, 1) > 0.75 Then - ' Hsplit1_MyRefresh - ' Endif - ' 'old_workaround for missing picture, maybe not needed with mpv. -'check if drag has stopped prevlayout = hsplit1.Layout Wait 0.025 If prevlayout[0] <> hsplit1.layout[0] Then Return timerhideshowvideo.start - + 'Hsplit1_MyRefresh End @@ -10027,6 +10125,8 @@ Dim prevlayout As Integer[] Dim xy As Integer + If Not fmain.fullyloaded Then Return + timerhideshowvideo.stop prevlayout = hsplit1.Layout If Not fsform.fullscreen Then @@ -10041,8 +10141,10 @@ Endif hsplit1.Layout = prevlayout Endif + + 'If firstplay = True Then Wait 1 + Hsplit1_MyRefresh() - Hsplit1_MyRefresh videobox.show Wait 0.025 Wait 0.025 @@ -10068,45 +10170,6 @@ End - Public Sub OLD_timerhideshowvideo_Timer() - Dim prevlayout As Integer[] - Dim xy As Integer - timerhideshowvideo.stop - prevlayout = hsplit1.Layout - If Not fsform.fullscreen Then - 'If (rightsidepanel.width < (ControlPanel.w + 64)) Then - 'If (seekbar.w < 64) Then - If (rightsidepanel.width < 480) Then - If (BottomVbox.Parent.name <> "FMain") Then - BottomVbox.Reparent(fmain) - Endif - Else - If (BottomVbox.Parent.name <> "RightSidePanel") And (Not (fsform.FullScreen)) Then - BottomVbox.Reparent(RightSidePanel) - Endif - Endif - hsplit1.Layout = prevlayout - Endif - - 'prevent glitches near the hsplit border - If Not fsform.fullscreen Then - xy = videobox.x - Wait - videobox.x = 20 - Wait - videobox.x = xy - Wait - Hsplit1_MyRefresh - Else - xy = videobox.y - videobox.y = 20 - Wait - videobox.y = xy - Wait - Endif - -End - Public Sub ShadeList(brother As Object, Optional dltx As Integer = 0, Optional dlty As Integer = 0) If Not fmain.fullyloaded Then Return @@ -10709,6 +10772,10 @@ Dim mymsg As String Dim mynow As String = Now() Dim ismp3 As Boolean = False + Dim audiocodec As String + Dim tracklist_current_audio As Integer = 0 + Try tracklist_current_audio = mplayer.getP("tracklist-current-audio") + audiocodec = mplayer.getP("track-list/" & tracklist_current_audio & "/codec") mynow = Replace(mynow, "/", "-") mynow = Replace(mynow, " ", "_") mynow = Replace(mynow, ":", ".") @@ -10716,9 +10783,9 @@ destfile &= "/Xt7.REC." destfile &= file.Name(mplayer.getP("fullpath")) & "-" & mynow destfile = Replace(destfile, ".pls", "") - Ismp3 = Ismp3 Or (Lower(mplayer.getP("fullpath")) Like "*.mp3") - Ismp3 = Ismp3 Or (Lower(mplayer.getP("audio-codec")) Like "*mpg123*") - Ismp3 = Ismp3 Or (Lower(mplayer.getP("audio-codec")) Like "*mp3*") + Ismp3 = Ismp3 Or (Lower(audiocodec) Like "*.mp3") + Ismp3 = Ismp3 Or (Lower(audiocodec) Like "*mpg123*") + Ismp3 = Ismp3 Or (Lower(audiocodec) Like "*mp3*") Ismp3 = Ismp3 And mplayer.getP("audioonly") If ismp3 Then @@ -10947,14 +11014,14 @@ Message.Error(("Please, first enter a playlist name to save"), "Ok") Return False Endif - If Not Exist(playlistsfullpath) Then + If Not Exist(playlistsfullpath, True) Then Try Mkdir playlistsfullpath If Error Then Message.Error(("Couldn't make the user playlist directory\n") & playlistsfullpath, ("Ok")) Return False Endif Endif - If Exist(playlistsfullpath & "/" & PlaylistsCombo.text & ".xpl") Then + If Exist(playlistsfullpath & "/" & PlaylistsCombo.text & ".xpl", True) Then If MyQuestion.Ask(PlaylistsCombo.text & " " & ("exists."), ("Overwrite"), ("Never mind")) = 2 Then Return False Endif Try myplaylist.SaveAs(playlistsfullpath & "/" & PlaylistsCombo.text & ".xpl") @@ -12169,14 +12236,7 @@ End Public Sub VideoAreaGroup_KeyRelease() - HotKeysHelper.keyRelease() - End -Public Sub switchresBTN_Enter() - - switchresBTN.menu = "menu_modes" - -End
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/FMain.form -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/FMain.form
Changed
@@ -862,6 +862,9 @@ Grid = False Header = GridView.Horizontal } + { timervolume #Timer + #MoveScaled(21,14) + } } { LibrarySelInfo Label MoveScaled(1,47,36,4) @@ -1410,7 +1413,7 @@ Text = ("Order by") } { ComboBoxOrderBy ComboBox - MoveScaled(9.4286,-31.2857,18,4) + MoveScaled(9.4286,-34.2857,18,4) #Translate = False Expand = True ReadOnly = True
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/GeneralOptions.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/GeneralOptions.class
Changed
@@ -362,9 +362,9 @@ t1 = Temp() Select Case Left(NoParseVisType2.text) Case "1" - 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[waves];[spectrum][waves]overlay[vo]'" + 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]'" Case "2" - 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),colorlevels=romax=0.5,colorkey=0x000000:0.1:0.5[waves];[spectrum][waves]overlay[vo]'" + 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]'" Case "3" Copy "shade_alpha.png" To t1 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]'"
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/GeneralOptions.form -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/GeneralOptions.form
Changed
@@ -40,7 +40,7 @@ } } { Tabstrip1 TabStrip - MoveScaled(26,0,62,67) + MoveScaled(27,0,62,67) Tag = "User options" Expand = True Arrangement = Arrange.Vertical
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/HotKeys.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/HotKeys.class
Changed
@@ -467,12 +467,12 @@ Dim C, R, w1, w2 As Integer - If Exist(filename_fs) Then + If Exist(filename_fs, True) Then Try dblclick_fs_checkbox.value = (File.Load(filename_fs) = "TRUE") Else dblclick_fs_checkbox.value = True 'default value Endif - If Exist(filename_global_hk) Then + If Exist(filename_global_hk, True) Then Try checkboxenableglobalhotkeys.value = (File.Load(filename_global_hk) = "TRUE") Else checkboxenableglobalhotkeys.value = False 'default value @@ -484,7 +484,7 @@ HotKeysGrid.Columns[c].w = -1 Next 'Local Hotkeys - If Exist(filename) Then + If Exist(filename, True) Then If Stat(filename, True).size > 0 Then HotFile = Open filename For Read For c = 0 To HotKeysGrid.Columns.Count - 1 @@ -504,7 +504,7 @@ Endif 'Global Hotkeys grid: - If Exist(filename) Then + If Exist(filename, True) Then If Stat(filename, True).size > 0 Then GlobalHotFile = Open Globalfilename For Read For c = 0 To GlobalHotKeysGrid.Columns.Count - 1
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/NewChains.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/NewChains.class
Changed
@@ -381,7 +381,7 @@ ' 'alimiter lavfi AllParams.Add(["TITLE", "Keep input signal under a desired threshold - (ffmpeg >=3.0 only)", "alimiter0", ""]) - AllParams.add(["RANGEFLOAT", "Input gain", "0.1", "2", "64", "alimiter1", ""]) + AllParams.add(["RANGEFLOAT", "Input gain", "0.1", "5", "64", "alimiter1", ""]) AllParams.add(["RANGEFLOAT", "output gain", "0.1", "1", "64", "alimiter2", ""]) AllParams.add(["RANGEFLOAT", "limit", "0.1", "1", "1", "alimiter3", ""]) AllParams.add(["RANGE", "attack", "1", "5", "80", "alimiter4", ""])
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/SubAndOsd.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/SubAndOsd.class
Changed
@@ -141,8 +141,10 @@ If (fullpath <> "") Then If MkvWorkaroundCHK.value Then 'http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1870 If (Lower(file.Ext((fullpath))) = "mkv") Then - opts.Add(o("sub-file", SConv(fullpath))) - opts.Add(o("sub-ass", "no")) + opts.Add(o("sub-file", "'" & SConv(fullpath) & "'")) + 'opts.Add(o("sub-ass", "no")) 'deprecated, use the following instead: + opts.Add(o("ass-style-override", "strip")) + opts.Add(o("embeddedfonts", "no")) Endif Endif Endif
View file
xt7-player-mpv-0.16.384.tar.gz/.src/Form/zzzFake.class -> xt7-player-mpv-0.18.384.tar.gz/.src/Form/zzzFake.class
Changed
@@ -15,7 +15,9 @@ Try global.arg_profile = Args.get("p", "profile-temp", ("Use specified profile only for this session"), "profilename") Try global.arg_append = Args.Has("a", "append", ("Append the file to the playlist of a running instance")) Try global.arg_new_instance = Args.Has("n", "new-instance", ("Play in a new instance even if one is already running")) + Try global.arg_start_tray = Args.Has("t", "tray", ("Start minimized in the tray")) Try global.arg_debug = Args.Has("v", "verbose", ("Enable debug output")) + Try global.arg_file = Args.end()[0] If (global.arg_file <> "") And Left(global.arg_file) <> "/" Then
View file
xt7-player-mpv-0.16.384.tar.gz/AA_ToDo -> xt7-player-mpv-0.18.384.tar.gz/AA_ToDo
Changed
@@ -727,16 +727,6 @@ ciò è fondamentale per youtube. - -Cambiamenti nel prossimo mpv: - --------------------------------------------------------------------------- --------------------------------------------------------------------------- - - - - - Nel panello di cambiamento automatico di velocità, mettere 2 checkbox: [x] Sto usando un'uscita ottica toslink [x] voglio codificare un ac3 quando cambio velocità. @@ -774,65 +764,7 @@ -visualizzazione audio: - -spectrum sotto con onde sopra: -10.5%cpu -build/mpv /mnt/nas.crypt/Musica/BestOfBowie/CD1/01.Space.Oddity.ogg --lavfi-complex='[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[waves];[spectrum][waves]overlay[vo]' -ao null - -Spectrum con onde sovraimpresse: -28%cpu -build/mpv /mnt/nas.crypt/Musica/BestOfBowie/CD1/01.Space.Oddity.ogg --lavfi-complex='[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),colorlevels=romax=0.5,colorkey=0x000000:0.1:0.5[waves];[spectrum][waves]overlay[vo]' -ao null - - - - -solo spectrum; l'immagine png è un gradiente da trasparente a nero. -5,5%cpu --lavfi-complex='[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=/tmp/out.png,scale=h=(in_h/1.5)[pic] ;[spectrum][pic]overlay[vo]' --no-keepaspect - -frequenze -7%cpu ---lavfi-complex='[aid1]asplit[ao][a1];[a1]showfreqs=s=256x256:mode=bar :colors=#ff0000|#aa0000 :averaging=0.6 - -Vectorscope sovraimpresso con hack per la sovraimpressione -17% cpu -build/mpv /mnt/nas.crypt/Musica/BestOfBowie/CD1/01.Space.Oddity.ogg --lavfi-complex='[aid1]asplit=3[a1][a2][ao]; [a2]adrawgraph=bg=#00000000:size=256x256[blank]; movie=/home/root/Gambas3/xt7-player-mpv-gtk/shade1.png,scale=256x256[pic]; [blank][pic]overlay[back] ; [a1]avectorscope=size=256x256[sp];[back][sp]overlay[vo]' - - -filtri presenti solo in ffmpeg >=3.0: - ... acompressor A->A Audio compressor. - ... aemphasis A->A Audio emphasis. - ... afftfilt A->A Apply arbitrary expressions to samples in - ... agate A->A Audio gate. - ... alimiter A->A Audio lookahead limiter. - ... allpass A->A Apply a two-pole all-pass filter. - ... amerge N->A Merge two or more audio streams into a single multi-channel stream. - T.. ametadata A->A Manipulate audio frame metadata. - ..C anequalizer A->N Apply high-order audio parametric multi band equalizer. - ... apulsator A->A Audio pulsator. - ... arealtime A->A Slow down filtering to match realtime. - ..C astreamselect N->N Select audio streams - ... compensationdelay A->A Audio Compensation Delay Line. - ... extrastereo A->A Increase difference between stereo audio channels. - ... sidechaingate AA->A Audio sidechain gate. - ... stereotools A->A Apply various stereo tools. - ... stereowiden A->A Apply stereo widening effect. - ... tremolo A->A Apply tremolo effect. - ... vibrato A->A Apply vibrato effect. - TS. chromakey V->V Turns a certain color into transparency. Operates on YUV colors. - T.. convolution V->V Apply convolution filter. - T.. displace VVV->V Displace pixels. - T.. maskedmerge VVV->V Merge first stream with second stream - T.. metadata V->V Manipulate video frame metadata. - T.. nnedi V->V Apply neural network edge directed interpolation intra-only deinterlacer. - ... realtime V->V Slow down filtering to match realtime. - TS. selectivecolor V->V Apply CMYK adjustments to specific color ranges. - T.. shuffleframes V->V Shuffle video frames. - ..C streamselect N->N Select video streams - T.. swaprect V->V Swap 2 rectangular objects in video. - ... testsrc |->V Generate test pattern. - ... testsrc2 |->V Generate another test pattern. - ... ahistogram A->V Convert input audio to histogram video output. - ... showspectrumpic A->V Convert input audio to a spectrum video output single picture. - ... spectrumsynth VV->A Convert input spectrum videos to audio output. + +Cambiamenti nel prossimo mpv: +-------------------------------------------------------------------------- + aspect: make video-zoom logarithmic: funzionano ancora il taglia bande nere e taglia metà bande nere?
View file
xt7-player-mpv-0.18.384.tar.gz/README.md
Added
@@ -0,0 +1,56 @@ +xt7-player-mpv +====== +An open source gui to mpv. +xt7-player-mpv aims to be an (in)complete graphical interface to mpv, focused on usability. + +It also provides extra features like youtube and shoutcast integration, dvbt, +media tagging, library and playlist managment and a lot more. +Visit: http://xt7-player.sourceforge.net/xt7forum/viewtopic.php?f=4&t=2 +for a screenshots tour. + +It is written and requires (the latest) Gambas3: +http://gambas.sourceforge.net/en/main.html + +<p align="center"> + <img src="http://wpage.unina.it/aorefice/sharevari/xt7-player-mpv-github-shots/main.jpg"</img> + <img src="http://wpage.unina.it/aorefice/sharevari/xt7-player-mpv-github-shots/music.jpg"</img> +</p> + + +Mandatory requirements: +====== + * Gambas 3 (usually the very latest version) + * Qt4 + * mpv + + + +Optional requirements: +====== + * taglib to tag audio files and speed-up library syncronization: + http://developer.kde.org/~wheeler/taglib.html + + * xbindkeys: to use global hotkeys + http://hocwp.free.fr/xbindkeys/ + + * scan and femon from LinuxTV dvb-apps to use dvbt features + http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps + + * youtube-dl to watch and download youtube videos + http://rg3.github.com/youtube-dl/ + + + +Compiling it: +====== +``` +After you installed gambas 3, just checkout and compile xt7 that way: + +# git clone https://github.com/kokoko3k/xt7-player-mpv.git +# cd xt7-player-mpv/ +# /path/to/gambas/binaries/gbc3 -e -a -g -t -p -m +# /path/to/gambas/binaries/gba3 +# ./xt7-player-mpv.gambas +``` + +
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.