[SCM] samplv1/master: Imported Upstream version 0.3.4
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Tue Sep 10 15:02:27 UTC 2013
The following commit has been merged in the master branch:
commit b7b05ff4f3315b6823486d326442cad8ddeebe6d
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Tue Sep 10 16:53:41 2013 +0200
Imported Upstream version 0.3.4
diff --git a/ChangeLog b/ChangeLog
index 6a04230..1808b0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,15 @@ samplv1 - an old-school polyphonic sampler
ChangeLog
-0.3.3 2013-05-31 Late spring blossoming
+0.3.4 2013-07-16 Brand new icon ready.
+
+- Preset file icon and mimetype now introduced.
+
+- A brand new icon drops the lamest old-schooler's out, in a
+ master lesson taught by Jarle Richard Akselsen, thanks.
+
+
+0.3.3 2013-05-31 Late spring blossoming.
- Some sympathy to extreme dark color (read black) schemes is
now being indulged; some discrete changes on the icon front
diff --git a/README b/README
index 1f70f86..332d157 100644
--- a/README
+++ b/README
@@ -80,6 +80,11 @@ installation:
make -f Makefile.svn
+acknowledgements:
+
+ samplv1 logo/icon is an original fine work of Jarle Richard Akselsen.
+
+
cheers && enjoy.
--
rncbc aka. Rui Nuno Capela
diff --git a/configure b/configure
index e88ac4b..e2ed66b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for samplv1 0.3.3.
+# Generated by GNU Autoconf 2.69 for samplv1 0.3.4.
#
# Report bugs to <rncbc at rncbc.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='samplv1'
PACKAGE_TARNAME='samplv1'
-PACKAGE_VERSION='0.3.3'
-PACKAGE_STRING='samplv1 0.3.3'
+PACKAGE_VERSION='0.3.4'
+PACKAGE_STRING='samplv1 0.3.4'
PACKAGE_BUGREPORT='rncbc at rncbc.org'
PACKAGE_URL=''
@@ -1263,7 +1263,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures samplv1 0.3.3 to adapt to many kinds of systems.
+\`configure' configures samplv1 0.3.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1324,7 +1324,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of samplv1 0.3.3:";;
+ short | recursive ) echo "Configuration of samplv1 0.3.4:";;
esac
cat <<\_ACEOF
@@ -1432,7 +1432,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-samplv1 configure 0.3.3
+samplv1 configure 0.3.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1809,7 +1809,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by samplv1 $as_me 0.3.3, which was
+It was created by samplv1 $as_me 0.3.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3842,9 +3842,9 @@ for X in $ac_with_paths; do
if test -d $X/bin; then
ac_path="$X/bin:$ac_path"
fi
- if test -x $X/qmake; then
- ac_path="$X:$ac_path"
- fi
+# if test -x $X/qmake; then
+# ac_path="$X:$ac_path"
+# fi
if test -d $X/include; then
for Y in qt qt4; do
if test -d $X/include/$Y; then
@@ -5371,7 +5371,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by samplv1 $as_me 0.3.3, which was
+This file was extended by samplv1 $as_me 0.3.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5433,7 +5433,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-samplv1 config.status 0.3.3
+samplv1 config.status 0.3.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -6158,7 +6158,7 @@ echo " ALSA MIDI support . . . . . . . . . . . . . . . .: $ac_alsa_midi"
echo " LV2 plug-in build . . . . . . . . . . . . . . . .: $ac_lv2"
echo " LV2 plug-in External UI support . . . . . . . . .: $ac_lv2_external_ui"
echo " OSC service support (liblo) . . . . . . . . . . .: $ac_liblo"
-echo " NSM support (EXPERIMENTAL) . . . . . . . . . . . .: $ac_nsm"
+echo " Non Session Management (NSM) support . . . . . . .: $ac_nsm"
echo
echo " Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix"
echo
diff --git a/configure.ac b/configure.ac
index bc2e8b3..ddb6518 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(samplv1, 0.3.3, rncbc at rncbc.org)
+AC_INIT(samplv1, 0.3.4, rncbc at rncbc.org)
AC_CONFIG_SRCDIR(src/samplv1.cpp)
AC_CONFIG_HEADERS(src/config.h)
@@ -142,9 +142,9 @@ for X in $ac_with_paths; do
if test -d $X/bin; then
ac_path="$X/bin:$ac_path"
fi
- if test -x $X/qmake; then
- ac_path="$X:$ac_path"
- fi
+# if test -x $X/qmake; then
+# ac_path="$X:$ac_path"
+# fi
if test -d $X/include; then
for Y in qt qt4; do
if test -d $X/include/$Y; then
@@ -433,7 +433,7 @@ echo " ALSA MIDI support . . . . . . . . . . . . . . . .: $ac_alsa_midi"
echo " LV2 plug-in build . . . . . . . . . . . . . . . .: $ac_lv2"
echo " LV2 plug-in External UI support . . . . . . . . .: $ac_lv2_external_ui"
echo " OSC service support (liblo) . . . . . . . . . . .: $ac_liblo"
-echo " NSM support (EXPERIMENTAL) . . . . . . . . . . . .: $ac_nsm"
+echo " Non Session Management (NSM) support . . . . . . .: $ac_nsm"
echo
echo " Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix"
echo
diff --git a/samplv1.spec.in b/samplv1.spec.in
index e4e9e39..9de9f82 100644
--- a/samplv1.spec.in
+++ b/samplv1.spec.in
@@ -1,6 +1,6 @@
%define name @PACKAGE_TARNAME@
%define version @PACKAGE_VERSION@
-%define release 10
+%define release 11
%define _prefix @ac_prefix@
@@ -47,15 +47,27 @@ BuildRequires: lv2-devel
%{_libdir}/lv2/%{name}.lv2/manifest.ttl
%{_libdir}/lv2/%{name}.lv2/%{name}.ttl
%{_libdir}/lv2/%{name}.lv2/%{name}.so
-#dir {_datadir}/applications
+#dir %{_datadir}/mime
+#dir %{_datadir}/mime/packages
+#dir %{_datadir}/applications
%dir %{_datadir}/icons/hicolor
%dir %{_datadir}/icons/hicolor/32x32
%dir %{_datadir}/icons/hicolor/32x32/apps
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/applications/%{name}.desktop
+%dir %{_datadir}/icons/hicolor/32x32/mimetypes
+%dir %{_datadir}/icons/hicolor/scalable
+%dir %{_datadir}/icons/hicolor/scalable/apps
+%dir %{_datadir}/icons/hicolor/scalable/mimetypes
%{_bindir}/%{name}_jack
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-%{name}*.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
+%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-%{name}*.svgz
%changelog
+* Tue Jul 16 2013 Rui Nuno Capela <rncbc at rncbc.org> 0.3.4-11
+- Brand new icon ready.
* Fri May 31 2013 Rui Nuno Capela <rncbc at rncbc.org> 0.3.3-10
- Late spring blossoming.
* Fri Mar 1 2013 Rui Nuno Capela <rncbc at rncbc.org> 0.3.2-9
diff --git a/src/images/samplv1.png b/src/images/samplv1.png
index 36c4b83..486c486 100644
Binary files a/src/images/samplv1.png and b/src/images/samplv1.png differ
diff --git a/src/images/samplv1.svgz b/src/images/samplv1.svgz
new file mode 100644
index 0000000..86180ae
Binary files /dev/null and b/src/images/samplv1.svgz differ
diff --git a/src/images/samplv1_preset.png b/src/images/samplv1_preset.png
new file mode 100644
index 0000000..cc24268
Binary files /dev/null and b/src/images/samplv1_preset.png differ
diff --git a/src/mimetypes/application-x-samplv1-preset.png b/src/mimetypes/application-x-samplv1-preset.png
new file mode 100644
index 0000000..cc24268
Binary files /dev/null and b/src/mimetypes/application-x-samplv1-preset.png differ
diff --git a/src/mimetypes/application-x-samplv1-preset.svgz b/src/mimetypes/application-x-samplv1-preset.svgz
new file mode 100644
index 0000000..9a02d84
Binary files /dev/null and b/src/mimetypes/application-x-samplv1-preset.svgz differ
diff --git a/src/mimetypes/samplv1.xml b/src/mimetypes/samplv1.xml
new file mode 100644
index 0000000..f309692
--- /dev/null
+++ b/src/mimetypes/samplv1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-samplv1-preset">
+ <sub-class-of type="text/xml"/>
+ <comment>synthv1 preset</comment>
+ <glob pattern="*.samplv1"/>
+ </mime-type>
+</mime-info>
diff --git a/src/samplv1.qrc b/src/samplv1.qrc
index e96a2e0..a10907a 100644
--- a/src/samplv1.qrc
+++ b/src/samplv1.qrc
@@ -6,5 +6,6 @@
<file>images/presetDelete.png</file>
<file>images/fileOpen.png</file>
<file>images/samplv1.png</file>
+ <file>images/samplv1_preset.png</file>
</qresource>
</RCC>
diff --git a/src/samplv1widget_preset.cpp b/src/samplv1widget_preset.cpp
index dfe05f9..4186b0d 100644
--- a/src/samplv1widget_preset.cpp
+++ b/src/samplv1widget_preset.cpp
@@ -398,11 +398,18 @@ void samplv1widget_preset::refreshPreset (void)
bool bBlockSignals = m_pComboBox->blockSignals(true);
const QString sOldPreset = m_pComboBox->currentText();
+ const QIcon icon(":/images/samplv1_preset.png");
m_pComboBox->clear();
samplv1widget_config *pConfig = samplv1widget_config::getInstance();
if (pConfig) {
pConfig->beginGroup(presetGroup());
- m_pComboBox->insertItems(0, pConfig->childKeys());
+ const QStringList& list = pConfig->childKeys();
+ QStringListIterator iter(list);
+ while (iter.hasNext()) {
+ const QString& sPreset = iter.next();
+ if (QFileInfo(pConfig->value(sPreset).toString()).exists())
+ m_pComboBox->addItem(icon, sPreset);
+ }
m_pComboBox->model()->sort(0);
pConfig->endGroup();
}
diff --git a/src/src_jack.pro b/src/src_jack.pro
index 832eae8..1dc3235 100644
--- a/src/src_jack.pro
+++ b/src/src_jack.pro
@@ -65,7 +65,8 @@ unix {
DEFINES += DATADIR=\"$${DATADIR}\"
- INSTALLS += target desktop icon
+ INSTALLS += target desktop icon \
+ icon_scalable mimeinfo mimetypes mimetypes_scalable
target.path = $${BINDIR}
@@ -74,6 +75,18 @@ unix {
icon.path = $${DATADIR}/icons/hicolor/32x32/apps
icon.files += images/$${NAME}.png
+
+ icon_scalable.path = $${DATADIR}/icons/hicolor/scalable/apps
+ icon_scalable.files += images/$${NAME}.svgz
+
+ mimeinfo.path = $${DATADIR}/mime/packages
+ mimeinfo.files += mimetypes/$${NAME}.xml
+
+ mimetypes.path = $${DATADIR}/icons/hicolor/32x32/mimetypes
+ mimetypes.files += mimetypes/application-x-$${NAME}-preset.png
+
+ mimetypes_scalable.path = $${DATADIR}/icons/hicolor/scalable/mimetypes
+ mimetypes_scalable.files += mimetypes/application-x-$${NAME}-preset.svgz
}
QT += xml
--
samplv1 packaging
More information about the pkg-multimedia-commits
mailing list