Signed-off-by: Mikhail Fedotov <anyrem...@mail.ru>
Index: Makefile
===================================================================
--- Makefile (revision 33799)
+++ Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=anyremote
-PKG_VERSION:=4.7.1
-PKG_RELEASE:=3
+PKG_VERSION:=6.1.1
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/${PKG_NAME}
-PKG_MD5SUM:=bd177156faa8a59a5d3e02cada243fc3
+PKG_MD5SUM:=edd10de359150ed3ecdd43435b02d6a3
include $(INCLUDE_DIR)/package.mk
@@ -31,7 +31,7 @@
define Build/Configure
$(call Build/Configure/Default, \
- --disable-xtest \
+ --disable-xtest --disable-glib --disable-iconv \
)
endef
Index: files/anyremote.cfg
===================================================================
--- files/anyremote.cfg (revision 33799)
+++ files/anyremote.cfg (working copy)
@@ -1,5 +1,5 @@
%
-% anyremote configuration file for sound management. (Server-mode)
+% anyremote configuration file for sound management and some admin stuff.
(Server-mode)
% prerequisites: amixer utility
%
@@ -8,13 +8,6 @@
% SOUND mixer
% ENV no
-% Uncomment if needed
-%AutoRepeat=false
-%Baudrate=19200
-Device=bluetooth:19
-%Log=true
-Screen=true
-
GuiAppName=Sound volume test
GuiAppIcon=sound.png
GuiAppType=Example
@@ -25,42 +18,127 @@
% 3 - increase sound volume
% 5 - show list of available controls
-[Aliases]
+[Protocol]=Server
-% Aliases for AverMedia IR remote
-VOLUMEDOWN=1
-MIN_INTERESTING=2
-VOLUMEUP=3
-TEXT=*
+(Init)=\
+ Macro(INIT_CONTROL);
-[End]
+(Connect)=\
+ Set(parameter,debug,on);\
+
Set(icons,SoundControl,1,minus,2,mute,3,plus,4,default,5,file,6,default,7,default,8,default,9,default,0,default,*,question,#,default);\
+ Macro(TEST_MIXER);\
+ Macro(SET_VIEW);
-[Keys]
+Cancel=Macro(QUIT);Exit
-(Init) =Macro(SET_CARD);Macro(TEST_MIXER);Macro(INIT_CONTROL);
-(Connect)=Set(parameter,debug,on);\
-
Set(icons,SoundControl,1,minus,2,mute,3,plus,4,default,5,configure,6,default,7,default,8,default,9,default,0,default,*,question,#,default);\
- Macro(SET_VIEW);
-SET_CARD =Make(var,mixer_card,echo 'if [ -f $HOME/.anyRemote/amixer.card ];
then cat $HOME/.anyRemote/amixer.card; else true; fi;'|bash -f -s);
-TEST_MIXER =Exec(echo 'TEST=`amixer $(mixer_card) sget Master,0`;U=`echo
$TEST|grep "Usage: amixer" |wc -l`;KD=`which kdialog|grep kdialog|grep -v
not|wc -l`;if [ "x$KD" == "x1" ]; then M="kdialog --msgbox"; else
M="echo";fi;if [ "x$U" != "x0" ]; then $M "ERROR: You have to correct example
according to Your system configuration !"; fi;'|bash -f -s);
-INIT_CONTROL=Exec(echo 'if [ -f $HOME/.anyRemote/amixer.control ]; then true;
else echo "Master@0" > $HOME/.anyRemote/amixer.control; fi;'|bash -f -s)
-SET_VIEW =Set(menu,add,Controls);ExecAndSet(title,cat
$HOME/.anyRemote/amixer.control|sed "s/@/,/");
+% SETUP_PACTL will be executed only if SETUP_AMIXER not executed
+SETUP_DEFAULT_MIXER=\
+ Macro(SETUP_AMIXER,pactl -h|grep set|grep sink|grep mute|grep -v
sink-input|wc -l);\
+ Macro(SETUP_PACTL,expr 1 - `pactl -h|grep set|grep sink|grep -v
sink-input|grep mute|wc -l`);
+
+SETUP_AMIXER=\
+ Make(var,default_mixer_up,by_value,amixer sset Master,0 5%+ -q);\
+ Make(var,default_mixer_down,by_value,amixer sset Master,0 5%- -q);\
+ Make(var,default_mixer_mute,by_value,amixer sset Master,0 toggle -q);\
+ Make(var,default_mixer_get,by_value,amixer sget Master,0|grep '\['|head
-1|cut -f 2 -d "["|cut -f 1 -d "]"|sed "s/%//");\
+ Make(var,default_mixer_set,by_value,amixer -q sset Master,0 );
+SETUP_PACTL=\
+ Make(var,default_sink,LANG=C;pactl stat|grep "Default Sink"|cut -f 2 -d
":"|tr -d ' ');\
+ Make(var,default_mixer_down,by_value,$(CfgDir)/Utils/pulse-audio-ctl.sh
down $(default_sink));\
+ Make(var,default_mixer_up,by_value,$(CfgDir)/Utils/pulse-audio-ctl.sh
up $(default_sink));\
+ Make(var,default_mixer_mute,by_value,$(CfgDir)/Utils/pulse-audio-ctl.sh
mute $(default_sink));\
+ Make(var,default_mixer_get,by_value,$(CfgDir)/Utils/pulse-audio-ctl.sh
get $(default_sink));\
+ Make(var,default_mixer_set,by_value,$(CfgDir)/Utils/pulse-audio-ctl.sh
set $(default_sink) );
+
+DEFAULT_VOLUME_UP=\
+ Exec($(default_mixer_up));
+
+DEFAULT_VOLUME_DOWN=\
+ Exec($(default_mixer_down));
+
+DEFAULT_TOGGLE_MUTE=\
+ Exec($(default_mixer_mute));
+
+% default_mixer_value in range 1-100
+DEFAULT_VOLUME_GET=\
+ Make(var,default_mixer_value,$(default_mixer_get));
+
+DEFAULT_VOLUME_SET=\
+ Exec($(default_mixer_set) $(default_mixer_value));
+
+TEST_MIXER=\
+ ExecAndSet(title,TEST=`amixer -c $(MixerCard) sget Master,0`;U=`echo
$TEST|grep "Usage: amixer" |wc -l`;if [ "x$U" != "x0" ]; then echo "You have to
correct example according to Your system configuration !"; else echo ""; fi);
+
+INIT_CONTROL=\
+ Exec(if [ -f $HOME/.anyRemote/amixer.control ]; then true; else echo
"Master@0" > $HOME/.anyRemote/amixer.control; fi)
+
+SET_VIEW=\
+ Set(menu,replace,Controls,Reboot,Shutdown);\
+ ExecAndSet(title,cat $HOME/.anyRemote/amixer.control|sed "s/@/,/");
+
+% v6.1.1 crashes on Dmesg,Processes
+% Set(menu,replace,Controls,Dmesg,Processes,Reboot,Shutdown);\
+
Cancel=Exit
-Controls=ExecAndSet(list,replace,Mixer Controls,amixer scontrols|sed 's/Simple
mixer control //;s/,/@/;s/$/,/');Set(menu,replace,Choose);
-Choose($$)=Exec(echo $(Param) >
$HOME/.anyRemote/amixer.control);Set(list,close);Macro(SET_VIEW);
-Back=Set(text,close);Macro(SET_VIEW);
-Back($$)=Set(list,close);Macro(SET_VIEW);
+Controls=\
+ ExecAndSet(list,replace,Mixer Controls,amixer scontrols|sed 's/Simple
mixer control //;s/,/@/;s/$/,/');\
+ Set(menu,replace,Choose);
-1=Exec(amixer $(mixer_card) sset `cat $HOME/.anyRemote/amixer.control|sed
"s/@/,/"` 5%- -q)
-2=Exec(amixer $(mixer_card) sset `cat $HOME/.anyRemote/amixer.control|sed
"s/@/,/"` toggle -q)
-3=Exec(amixer $(mixer_card) sset `cat $HOME/.anyRemote/amixer.control|sed
"s/@/,/"` 5%+ -q)
+Dmesg=\
+ ExecAndSet(text,replace,Dmesg, dmesg|tail -50);
+Processes=\
+ Make(mode,PROCS);
+
+Reboot=\
+ Exec(reboot);
+
+Shutdown=\
+ Exec(poweroff);
+
+Choose($$)=\
+ Exec(echo $(Param) > $HOME/.anyRemote/amixer.control);\
+ Set(list,close);\
+ Macro(SET_VIEW);
+
+Push($$)=\
+ Macro(Choose($$));
+
+Back=\
+ Set(text,close);\
+ Macro(SET_VIEW);
+
+Back($$)=\
+ Set(list,close);\
+ Macro(SET_VIEW);
+
+1=Exec(amixer -c $(MixerCard) sset `cat $HOME/.anyRemote/amixer.control|sed
"s/@/,/"` 5%- -q)
+2=Exec(amixer -c $(MixerCard) sset `cat $HOME/.anyRemote/amixer.control|sed
"s/@/,/"` toggle -q)
+3=Exec(amixer -c $(MixerCard) sset `cat $HOME/.anyRemote/amixer.control|sed
"s/@/,/"` 5%+ -q)
+
5=Macro(Controls);
-* *=Set(text,replace,Help,1 - Vol-\n2 - Mute/Unmute\n3 - Vol+\n5 - Choose
mixer control)
+* *=Set(text,replace,Help,1 - Vol-\n2 - Mute/Unmute\n3 - Vol+\n5 - Choose
mixer control\nKnown problem: mute/unmute can work incorrectly with PulseAudio)
+
+[Mode]=PROCS
+
+(EnterMode)=\
+ ExecAndSet(list,replace,User Processes, ps -o pid -o command -u
`whoami`|tr -s ' '|cut -d ' ' -f 1,2,3|sed 's/$/,/'|grep -v sed|grep -v cut);\
+ Set(menu,replace,Kill);
+
+Kill($$)=\
+ Exec(kill `echo $(Param)|cut -d ' ' -f 1`);\
+ ExecAndSet(list,replace,SAME,ps -o pid -o command -u `whoami`|tr -s '
'|cut -d ' ' -f 1,2,3|sed 's/$/,/'|grep -v sed|grep -v cut);
+
+Back($$)=\
+ Set(list,close);\
+ Macro(SET_VIEW);\
+ Make(mode,default);
+
+[ModeEnd]
+
[End]
-
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
