Added default melodies to build.
authorzev <zev@radensolutions.com>
Fri, 24 Apr 2015 17:31:58 +0000 (20:31 +0300)
committerzev <zev@radensolutions.com>
Mon, 27 Apr 2015 05:41:12 +0000 (08:41 +0300)
19 files changed:
ChangeLog
configure.ac
contrib/music/Makefile.am [new file with mode: 0644]
contrib/music/Warning-A.wav [new file with mode: 0755]
contrib/music/Warning-B.wav [new file with mode: 0755]
contrib/music/Warning-C.wav [new file with mode: 0755]
contrib/music/Warning-D.wav [new file with mode: 0755]
contrib/music/Warning-E.wav [new file with mode: 0755]
contrib/music/Warning-F.wav [new file with mode: 0755]
contrib/music/Warning-Notification-A.wav [new file with mode: 0755]
contrib/music/Warning-Notification-B.wav [new file with mode: 0755]
contrib/music/Warning-Notification-C.wav [new file with mode: 0755]
contrib/music/Warning-Notification-D.wav [new file with mode: 0755]
contrib/music/Warning-Notification-F.wav [new file with mode: 0755]
packages/solaris/server/Prototype
src/install/windows/netxms-minimal.iss
src/install/windows/netxms-x64-minimal.iss
src/install/windows/netxms-x64.iss
src/install/windows/netxms.iss

index b923a91..15b516f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
 - Fixed broken PING subagent
 - Fixed database upgrade issues on MS SQL
 - IPv6 support in PING subagent
+- Added default melodies for alarms
+- Added option to play sound on alarm sound preference page
 - Android Agent:
        - Added support for Lollipop MR1 (v5.1)
        - Updated support library
index 6b9e306..7f0798a 100644 (file)
@@ -509,7 +509,7 @@ AC_ARG_WITH(dist,
        NXCONFIG="nxconfig"
        TOP_LEVEL_MODULES="include sql images tests"
        SERVER_INCLUDE="include"
-       CONTRIB_MODULES="mibs backgrounds"
+       CONTRIB_MODULES="mibs backgrounds music"
        CLIENT_COMPONENTS="nxalarm nxevent nxpush nxsms"
        SERVER_TOOLS="nxconfig"
 )
@@ -667,7 +667,7 @@ if test $? = 0; then
        BUILD_SERVER="yes"
        MODULES="$MODULES libnxmap libnxsl libnxlp db server nxscript"
        TOP_LEVEL_MODULES="$TOP_LEVEL_MODULES sql images"
-       CONTRIB_MODULES="$CONTRIB_MODULES mibs backgrounds"
+       CONTRIB_MODULES="$CONTRIB_MODULES mibs backgrounds music"
        if test "x$XMPP_SUPPORT" = "xyes"; then
                MODULES="libstrophe $MODULES"
                AC_DEFINE(XMPP_SUPPORTED, 1, Define to 1 if XMPP is supported)
@@ -2738,6 +2738,7 @@ AC_CONFIG_FILES([
        contrib/integration/HP_EVA/Makefile
        contrib/integration/HP_P2000/Makefile
        contrib/mibs/Makefile
+       contrib/music/Makefile
        contrib/startup/Makefile
        contrib/startup/debian/Makefile
        contrib/startup/gentoo/Makefile
diff --git a/contrib/music/Makefile.am b/contrib/music/Makefile.am
new file mode 100644 (file)
index 0000000..bb17caf
--- /dev/null
@@ -0,0 +1,27 @@
+# Copyright (C) 2004, 2005 NetXMS Team <bugs@netxms.org>
+#  
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without 
+# modifications, as long as this notice is preserved.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+musicdir=$(pkgdatadir)/files
+
+music_DATA = \
+       Warning-A.wav \
+       Warning-B.wav \
+       Warning-C.wav \
+       Warning-D.wav \
+       Warning-E.wav \
+       Warning-F.wav \
+    Warning-Notification-A.wav \
+    Warning-Notification-B.wav \
+    Warning-Notification-C.wav \
+    Warning-Notification-D.wav \
+    Warning-Notification-F.wav 
+    
+EXTRA_DIST=$(music_DATA)
diff --git a/contrib/music/Warning-A.wav b/contrib/music/Warning-A.wav
new file mode 100755 (executable)
index 0000000..54865da
Binary files /dev/null and b/contrib/music/Warning-A.wav differ
diff --git a/contrib/music/Warning-B.wav b/contrib/music/Warning-B.wav
new file mode 100755 (executable)
index 0000000..27ace6e
Binary files /dev/null and b/contrib/music/Warning-B.wav differ
diff --git a/contrib/music/Warning-C.wav b/contrib/music/Warning-C.wav
new file mode 100755 (executable)
index 0000000..d7b2edf
Binary files /dev/null and b/contrib/music/Warning-C.wav differ
diff --git a/contrib/music/Warning-D.wav b/contrib/music/Warning-D.wav
new file mode 100755 (executable)
index 0000000..ecec42f
Binary files /dev/null and b/contrib/music/Warning-D.wav differ
diff --git a/contrib/music/Warning-E.wav b/contrib/music/Warning-E.wav
new file mode 100755 (executable)
index 0000000..d462da8
Binary files /dev/null and b/contrib/music/Warning-E.wav differ
diff --git a/contrib/music/Warning-F.wav b/contrib/music/Warning-F.wav
new file mode 100755 (executable)
index 0000000..4e46be3
Binary files /dev/null and b/contrib/music/Warning-F.wav differ
diff --git a/contrib/music/Warning-Notification-A.wav b/contrib/music/Warning-Notification-A.wav
new file mode 100755 (executable)
index 0000000..d7f704c
Binary files /dev/null and b/contrib/music/Warning-Notification-A.wav differ
diff --git a/contrib/music/Warning-Notification-B.wav b/contrib/music/Warning-Notification-B.wav
new file mode 100755 (executable)
index 0000000..eb3900c
Binary files /dev/null and b/contrib/music/Warning-Notification-B.wav differ
diff --git a/contrib/music/Warning-Notification-C.wav b/contrib/music/Warning-Notification-C.wav
new file mode 100755 (executable)
index 0000000..239d41c
Binary files /dev/null and b/contrib/music/Warning-Notification-C.wav differ
diff --git a/contrib/music/Warning-Notification-D.wav b/contrib/music/Warning-Notification-D.wav
new file mode 100755 (executable)
index 0000000..2f50d0a
Binary files /dev/null and b/contrib/music/Warning-Notification-D.wav differ
diff --git a/contrib/music/Warning-Notification-F.wav b/contrib/music/Warning-Notification-F.wav
new file mode 100755 (executable)
index 0000000..957ae4c
Binary files /dev/null and b/contrib/music/Warning-Notification-F.wav differ
index 1060cf5..e0cf8cb 100644 (file)
@@ -13,6 +13,7 @@ d none /opt/netxms/share/netxms 0755 root other
 d none /opt/netxms/share/netxms/backgrounds 0755 root other
 d none /opt/netxms/share/netxms/images 0755 root other
 d none /opt/netxms/share/netxms/mibs 0755 root other
+d none /opt/netxms/share/netxms/files 0755 root other
 d none /opt/netxms/share/netxms/sql 0755 root other
 d none /opt/netxms/svc 0755 root other
 f none /opt/netxms/bin/netxmsd 0755 root other
@@ -493,6 +494,17 @@ f none /opt/netxms/share/netxms/mibs/WWW-MIB.txt 0644 root other
 f none /opt/netxms/share/netxms/mibs/XPPC-MIB.txt 0644 root other
 f none /opt/netxms/share/netxms/mibs/ZONE-DEFENSE-MGMT-MIB.txt 0644 root other
 f none /opt/netxms/share/netxms/mibs/netxms.mib 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-A.wav 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-B.wav 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-C.wav 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-D.wav 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-E.wav 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-F.wav 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-Notification-A.wav 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-Notification-B.wav 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-Notification-C.wav 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-Notification-D.wav 0644 root other
+f none /opt/netxms/share/netxms/files/Warning-Notification-F.wav 0644 root other
 f none /opt/netxms/share/netxms/sql/dbinit_db2.sql 0644 root other
 f none /opt/netxms/share/netxms/sql/dbinit_mssql.sql 0644 root other
 f none /opt/netxms/share/netxms/sql/dbinit_mysql.sql 0644 root other
index 59e4e33..cd406fe 100644 (file)
@@ -189,6 +189,7 @@ Source: "..\..\..\contrib\mibs\*.txt"; DestDir: "{app}\var\mibs"; Flags: ignorev
 Source: "..\..\..\contrib\netxmsd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: server
 Source: "..\..\..\contrib\nxagentd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: server
 Source: "..\..\..\images\*"; DestDir: "{app}\var\images"; Flags: ignoreversion; Components: server
+Source: "..\..\..\contrib\music\*"; DestDir: "{app}\var\files"; Flags: ignoreversion; Components: server
 ; Command-line tools files
 Source: "..\..\..\Release\libnxclient.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
 Source: "..\..\..\Release\libnxclient.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools and pdb
index 03fefa9..cdae7cd 100644 (file)
@@ -192,6 +192,7 @@ Source: "..\..\..\contrib\mibs\*.txt"; DestDir: "{app}\var\mibs"; Flags: ignorev
 Source: "..\..\..\contrib\netxmsd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: server
 Source: "..\..\..\contrib\nxagentd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: server
 Source: "..\..\..\images\*"; DestDir: "{app}\var\images"; Flags: ignoreversion; Components: server
+Source: "..\..\..\contrib\music\*"; DestDir: "{app}\var\files"; Flags: ignoreversion; Components: server
 ; Command-line tools files
 Source: "..\..\..\x64\Release\libnxclient.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
 Source: "..\..\..\x64\Release\libnxclient.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools and pdb
index a0b3796..5f01cb3 100644 (file)
@@ -198,6 +198,7 @@ Source: "..\..\..\contrib\mibs\*.txt"; DestDir: "{app}\var\mibs"; Flags: ignorev
 Source: "..\..\..\contrib\netxmsd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: server
 Source: "..\..\..\contrib\nxagentd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: server
 Source: "..\..\..\images\*"; DestDir: "{app}\var\images"; Flags: ignoreversion; Components: server
+Source: "..\..\..\contrib\music\*"; DestDir: "{app}\var\files"; Flags: ignoreversion; Components: server
 ; Command-line tools files
 Source: "..\..\..\x64\Release\libnxclient.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
 Source: "..\..\..\x64\Release\libnxclient.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools and pdb
index 385a9f0..2d370ac 100644 (file)
@@ -195,6 +195,7 @@ Source: "..\..\..\contrib\mibs\*.txt"; DestDir: "{app}\var\mibs"; Flags: ignorev
 Source: "..\..\..\contrib\netxmsd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: server
 Source: "..\..\..\contrib\nxagentd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: server
 Source: "..\..\..\images\*"; DestDir: "{app}\var\images"; Flags: ignoreversion; Components: server
+Source: "..\..\..\contrib\music\*"; DestDir: "{app}\var\files"; Flags: ignoreversion; Components: server
 ; Command-line tools files
 Source: "..\..\..\Release\libnxclient.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
 Source: "..\..\..\Release\libnxclient.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools and pdb