clockworkpi/launcher
1
0
Fork 0
mirror of https://github.com/clockworkpi/launcher.git synced 2026-03-21 03:12:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Respond to user requests for changes" (#37)

Browse Source 
* Revert "Respond to user requests (#35)"

This reverts commit dc1b7e007c.

* Revert "image text"

This reverts commit 968db78adb.

* Revert "add restore in POWEROPT event"

This reverts commit 88523224de.

* Revert "off to OFF"

This reverts commit 586aa75ae4.

* Revert "text fix"

This reverts commit 8e3a90589a.

* Revert "ignore powerlevel"

This reverts commit 164b55fb4b.

* Revert "switch smalltext"

This reverts commit 01a5f2ef9a.

* Revert "text fix"

This reverts commit e03a9da323.

* Revert "text fix"

This reverts commit b5603bcf7c.

* Revert "sudo rfkill"

This reverts commit 2bbeba5665.

* Revert "InspectionTeam"

This reverts commit 3db3b0e8b3.

* Revert "move back CurKeySet"

This reverts commit 10f7e35e2e.

* Revert "rm png"

This reverts commit bfdb83683a.

* Revert "airplane mode with animation"

This reverts commit 6e19ad88a7.

* Revert "add detail on power mode"

This reverts commit d66a0df823.

* Revert "add PowerLevel options"

This reverts commit 36c54a4f9d.

* Revert "TitleBar show airplane mode icon"

This reverts commit 74e7f8ab69.

* Revert "Toggle AirPlane Mode"

This reverts commit 2d11df8c37.

* Revert "start sheep"

This reverts commit 8f965b3ba5.

* Revert "fix bug dosbox on rom_list_page and remove scalesmooth on sec level icons"

This reverts commit b4e40d052a.

* Revert "fix fav display bug on dosbox"

This reverts commit 40be34e30d.

* Revert "add dosbox on fav"

This reverts commit 2cba2e5808.

* Revert "add dosbox"

This reverts commit bd71c64a5c.

* Revert "Move back to 10_Settings"

This reverts commit 4acacaf736.

* Revert "change load modules checking in Settings list_page"

This reverts commit 385b672eeb.

* Revert "develop branch commit"

This reverts commit f604310bb2.
This commit is contained in:
clockworkpi
2018-07-04 16:41:40 +08:00
committed by GitHub
parent 89f1ebae8b
commit db5408d198
24 changed files with 92 additions and 1195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
Menu/GameShell/Music Player/mpd_spectrum_page.py
View File

@@ -3,7 +3,7 @@
import time
import pygame
from numpy import fromstring,ceil,abs,log10,isnan,isinf,int16,sqrt,mean
from numpy import fromstring,ceil,abs,log10,isnan,isinf,int16
from numpy import fft as Fft
import gobject
@@ -11,14 +11,12 @@ import gobject
from beeprint import pp
## local UI import
from UI.constants import Width,Height,ICON_TYPES
from UI.constants import Width,Height
from UI.page import Page,PageSelector
from UI.label import Label
from UI.fonts import fonts
from UI.util_funcs import midRect
from UI.keys_def import CurKeys
from UI.icon_item import IconItem
from UI.icon_pool import MyIconPool
from Queue import Queue, Empty
from threading import Thread
@@ -39,9 +37,6 @@ class PIFI(object):
count = 0
average = 0
rmscount=0
rmsaverage=0
def __init__(self):
self.sampleSize = self._SAMPLE_SIZE
@@ -59,14 +54,7 @@ class PIFI(object):
def resetSmoothing(self):
self.count = 0
self.average = 0
self.rmscount = 0
self.rmsaverage = 0
def rms_smoothOut(self, x):
self.rmscount += 1
self.rmsaverage = (self.rmsaverage*self.rmscount + x) / (self.rmscount+1)
return self.rmsaverage
def smoothOut(self, x):
self.count += 1
self.average = (self.average*self.count + x) / (self.count+1)
@@ -87,8 +75,7 @@ class PIFI(object):
# Compute the scaled list of values
scaledList = [int(x*scaleFactor) for x in _list ]
return scaledList
def computeSpectrum(self, fifoFile):
# Read PCM samples from fifo
@@ -104,17 +91,6 @@ class PIFI(object):
# Normalize [-1; +1]
pcm = pcm / (2.**15)
# Compute RMS directly from signal
rms = sqrt(mean(pcm**2))
# Compute a simple 'moving maximum'
maximum = 2*self.rms_smoothOut(rms)
if maximum == 0:
scaleFactor = 0.0
else:
scaleFactor = self._SCALE_WIDTH/float(maximum)
final_rms = int(rms*scaleFactor)
# Compute FFT
N = pcm.size
@@ -151,8 +127,8 @@ class PIFI(object):
# Scale the spectrum
scaledSpectrum = self.scaleList(spectrum)
scaledSpectrum.append( final_rms)
return scaledSpectrum
return (self.bins, scaledSpectrum)
class MPDSpectrumPage(Page):
@@ -164,28 +140,11 @@ class MPDSpectrumPage(Page):
_ListFont = fonts["veramono12"]
_PIFI = None
_FIFO = None
_FiFo = None
_Color = pygame.Color(126,206,244)
_GobjectIntervalId = -1
_Queue = None
_KeepReading = True
_BGpng = None
_BGwidth = 320
_BGheight = 200
_SheepHead = None
_SheepHeadW = 69
_SheepHeadH = 66
_SheepBody = None
_SheepBodyW = 105
_SheepBodyH = 81
_freq_count = 0
_head_dir = 0
_Neighbor = None
def __init__(self):
Page.__init__(self)
@@ -201,27 +160,8 @@ class MPDSpectrumPage(Page):
self._CanvasHWND = self._Screen._CanvasHWND
"""
self._BGpng = IconItem()
self._BGpng._ImgSurf = MyIconPool._Icons["sheep_bg"]
self._BGpng._MyType = ICON_TYPES["STAT"]
self._BGpng._Parent = self
self._BGpng.Adjust(0,0,self._BGwidth,self._BGheight,0)
self._SheepHead = IconItem()
self._SheepHead._ImgSurf = MyIconPool._Icons["sheep_head"]
self._SheepHead._MyType = ICON_TYPES["STAT"]
self._SheepHead._Parent = self
self._SheepHead.Adjust(0,0,self._SheepHeadW,self._SheepHeadH,0)
self._SheepBody = IconItem()
self._SheepBody._ImgSurf = MyIconPool._Icons["sheep_body"]
self._SheepBody._MyType = ICON_TYPES["STAT"]
self._SheepBody._Parent = self
self._SheepBody.Adjust(0,0,self._SheepBodyW,self._SheepBodyH,0)
"""
self.Start()
self._GobjectIntervalId = gobject.timeout_add(50,self.Playing)
def Start(self):
@@ -246,7 +186,7 @@ class MPDSpectrumPage(Page):
print("self._FIFO none")
return
scaledSpectrum = self._PIFI.computeSpectrum(self._FIFO)
(bins,scaledSpectrum) = self._PIFI.computeSpectrum(self._FIFO)
self._Queue.put( scaledSpectrum )
self._KeepReading = False
@@ -272,9 +212,7 @@ class MPDSpectrumPage(Page):
return True
def OnLoadCb(self):
if self._FIFO == None:
self.Start()
if self._Queue != None:
with self._Queue.mutex:
self._Queue.queue.clear()
@@ -290,14 +228,6 @@ class MPDSpectrumPage(Page):
def KeyDown(self,event):
if event.key == CurKeys["Menu"] or event.key == CurKeys["A"]:
if self._FIFO != None and self._FIFO.closed == False:
try:
self._FIFO.close()
self._FIFO = None
except Exception, e:
print(e)
self.ReturnToUpLevelPage()
self._Screen.Draw()
self._Screen.SwapAndShow()
@@ -308,6 +238,7 @@ class MPDSpectrumPage(Page):
if event.key == CurKeys["Enter"]:
pass
def Draw(self):
self.ClearCanvas()
@@ -315,18 +246,15 @@ class MPDSpectrumPage(Page):
bw = 10
spects = None
try:
spects = self._Queue.get_nowait() ## last element is rms
spects = self._Queue.get_nowait()
# print("get_nowait: " , spects)
except Empty:
return
else: # got line
if len(spects) == 0:
return
w = self._Width / len( spects[0:-1] )
w = self._Width / len(spects)
left_margin = (w-bw)/2
for i,v in enumerate(spects[0:-1]):
for i,v in enumerate(spects):
pygame.draw.rect(self._CanvasHWND,self._Color,(i*w+left_margin,self._Height-v,bw,v),0)

12
Menu/GameShell/Music Player/play_list_page.py
View File

@@ -64,7 +64,6 @@ class PlayListPage(Page):
_ListFont = fonts["notosanscjk15"]
_Scroller = None
_CurSongTime="0:0"
_BGpng = None
_BGwidth = 75
@@ -111,13 +110,12 @@ class PlayListPage(Page):
self.SyncPlaying()
def GObjectInterval(self): ## 250 ms
self.SyncPlaying()
def GObjectInterval(self): ## 250 ms
if self._Screen.CurPage() == self:
self.SyncPlaying()
self._Screen.Draw()
self._Screen.SwapAndShow()
return True
def SyncPlaying(self):
@@ -140,14 +138,13 @@ class PlayListPage(Page):
else:
self._MyList[posid]._Playing = True
if "time" in current_song:
self._CurSongTime = current_song["time"]
times_ = current_song["time"].split(":")
if len(times_)> 1:
cur = float(times_[0])
end = float(times_[1])
pros = int((cur/end)*100.0)
self._MyList[posid]._PlayingProcess = pros
def InPlayList(self,path):
for i,v in enumerate(self._MyList):
@@ -274,7 +271,6 @@ class PlayListPage(Page):
self.Click()
if event.key == CurKeys["Start"]: # start spectrum
myvars.SpectrumPage._Neighbor = self
self._Screen.PushPage(myvars.SpectrumPage)
self._Screen.Draw()
self._Screen.SwapAndShow()