[SCM] python-pyo/master: Fixing conflicts
tiago at users.alioth.debian.org
tiago at users.alioth.debian.org
Fri Jan 30 04:34:08 UTC 2015
The following commit has been merged in the master branch:
commit fd9541fd482f9fd56199c45310f82c92b3abba97
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date: Thu Jan 29 22:55:46 2015 -0500
Fixing conflicts
diff --git a/ChangeLog b/ChangeLog
index 169decf..1e01dd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
2015-01-29 belangeo <belangeo at gmail.com>
* Release tag: 0.7.4
@@ -172,7 +170,6 @@
-------------------------------------------------------------------------------------
->>>>>>> upstream/0.7.4
2014-08-29 belangeo <belangeo at gmail.com>
* Release tag: 0.7.0.
diff --git a/doc-sphinx/source/api/alphabetical.rst b/doc-sphinx/source/api/alphabetical.rst
index 0eb3d4a..a67b7d7 100644
--- a/doc-sphinx/source/api/alphabetical.rst
+++ b/doc-sphinx/source/api/alphabetical.rst
@@ -159,10 +159,7 @@ Alphabetical class reference
- :py:class:`Pan` : Cosinus panner with control on the spread factor.
- :py:class:`ParaTable` : Generates parabola window function.
- :py:class:`PartialTable` : Inharmonic waveform generator.
-<<<<<<< HEAD
-=======
- :py:class:`Particle` : A full control granular synthesis generator.
->>>>>>> upstream/0.7.4
- :py:class:`Pattern` : Periodically calls a Python function.
- :py:class:`PeakAmp` : Peak amplitude follower.
- :py:class:`Percent` : Lets pass a certain percentage of the input triggers.
diff --git a/doc-sphinx/source/api/classes/effects.rst b/doc-sphinx/source/api/classes/effects.rst
index 6724810..25a3201 100644
--- a/doc-sphinx/source/api/classes/effects.rst
+++ b/doc-sphinx/source/api/classes/effects.rst
@@ -84,12 +84,9 @@ as distortions, delays, chorus and reverbs.
.. autoclass:: STRev
:members:
-<<<<<<< HEAD
-=======
*SmoothDelay*
---------------
.. autoclass:: SmoothDelay
:members:
->>>>>>> upstream/0.7.4
diff --git a/doc-sphinx/source/conf.py b/doc-sphinx/source/conf.py
index f34cb70..c2779e5 100644
--- a/doc-sphinx/source/conf.py
+++ b/doc-sphinx/source/conf.py
@@ -50,15 +50,9 @@ copyright = u'2014, Olivier Bélanger'
# built documents.
#
# The short X.Y version.
-<<<<<<< HEAD
-version = '0.7.0'
-# The full version, including alpha/beta/rc tags.
-release = '0.7.0'
-=======
version = PYO_VERSION
# The full version, including alpha/beta/rc tags.
release = PYO_VERSION
->>>>>>> upstream/0.7.4
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/doc-sphinx/source/index.rst b/doc-sphinx/source/index.rst
index ade0d94..d2de0de 100644
--- a/doc-sphinx/source/index.rst
+++ b/doc-sphinx/source/index.rst
@@ -3,11 +3,7 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
-<<<<<<< HEAD
-Welcome to the Pyo 0.7.0 documentation
-=======
Welcome to the Pyo 0.7.4 documentation
->>>>>>> upstream/0.7.4
===================================================
.. toctree::
diff --git a/include/pyomodule.h b/include/pyomodule.h
index a480cae..a8b9c71 100644
--- a/include/pyomodule.h
+++ b/include/pyomodule.h
@@ -21,11 +21,7 @@
#include "Python.h"
#include <math.h>
-<<<<<<< HEAD
-#define PYO_VERSION "0.7.0"
-=======
#define PYO_VERSION "0.7.4"
->>>>>>> upstream/0.7.4
#ifndef __MYFLT_DEF
#define __MYFLT_DEF
@@ -474,8 +470,6 @@ extern PyTypeObject ComplexResType;
extern PyTypeObject STReverbType;
extern PyTypeObject STRevType;
extern PyTypeObject Pointer2Type;
-<<<<<<< HEAD
-=======
extern PyTypeObject CentroidType;
extern PyTypeObject AttackDetectorType;
extern PyTypeObject SmoothDelayType;
@@ -489,7 +483,6 @@ extern PyTypeObject ScopeType;
extern PyTypeObject PeakAmpType;
extern PyTypeObject MainParticleType;
extern PyTypeObject ParticleType;
->>>>>>> upstream/0.7.4
/* Constants */
#define E M_E
@@ -527,11 +520,8 @@ extern PyTypeObject ParticleType;
#define FREEVERB_ID 24
#define XNOISEDUR_ID 25
#define URN_ID 26
-<<<<<<< HEAD
-=======
#define GRANULE_ID 27
#define MAINPARTICLE_ID 28
->>>>>>> upstream/0.7.4
/* Do not forget to modify Server_generateSeed function */
/* object headers */
@@ -764,7 +754,6 @@ extern PyTypeObject ParticleType;
PyObject *samples, *tuple, *sizetmp = NULL; \
\
static char *kwlist[] = {"size", NULL}; \
-<<<<<<< HEAD
\
if (! PyArg_ParseTupleAndKeywords(args, kwds, "O", kwlist, &sizetmp)) \
return PyInt_FromLong(-1); \
@@ -791,34 +780,6 @@ extern PyTypeObject ParticleType;
amp = h2 - 2; \
step = (float)self->size / (float)(w); \
\
-=======
- \
- if (! PyArg_ParseTupleAndKeywords(args, kwds, "O", kwlist, &sizetmp)) \
- return PyInt_FromLong(-1); \
- \
- if (sizetmp) { \
- if (PyTuple_Check(sizetmp)) { \
- w = PyInt_AsLong(PyTuple_GET_ITEM(sizetmp, 0)); \
- h = PyInt_AsLong(PyTuple_GET_ITEM(sizetmp, 1)); \
- } \
- else if (PyList_Check(sizetmp)) { \
- w = PyInt_AsLong(PyList_GET_ITEM(sizetmp, 0)); \
- h = PyInt_AsLong(PyList_GET_ITEM(sizetmp, 1)); \
- } \
- else { \
- w = 500; \
- h = 200; \
- } \
- } \
- else { \
- w = 500; \
- h = 200; \
- } \
- h2 = h/2; \
- amp = h2 - 2; \
- step = (float)self->size / (float)(w); \
- \
->>>>>>> upstream/0.7.4
samples = PyList_New(w); \
for(i=0; i<w; i++) { \
y = self->data[(int)(i*step)] * amp + amp + 2; \
diff --git a/include/servermodule.h b/include/servermodule.h
index a9e9374..0fedc69 100644
--- a/include/servermodule.h
+++ b/include/servermodule.h
@@ -72,15 +72,10 @@ typedef struct {
int jackautoout; /* jack port auto-connection (on by default) */
PyObject *jackAutoConnectInputPorts; /* list of regex to match for jack auto-connection */
PyObject *jackAutoConnectOutputPorts; /* list of regex to match for jack auto-connection */
-<<<<<<< HEAD
- PmStream *in;
- PmStream *out;
-=======
PmStream *midiin[64];
PmStream *midiout[64];
int midiin_count;
int midiout_count;
->>>>>>> upstream/0.7.4
PmEvent midiEvents[200];
int midi_count;
double samplingRate;
diff --git a/installers/osx/PkgResources_x86_64/ReadMe.rtf b/installers/osx/PkgResources_x86_64/ReadMe.rtf
index f5fbe7b..7339a3b 100755
--- a/installers/osx/PkgResources_x86_64/ReadMe.rtf
+++ b/installers/osx/PkgResources_x86_64/ReadMe.rtf
@@ -1,15 +1,4 @@
{\rtf1\ansi\deff3\adeflang1025
-<<<<<<< HEAD
-{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f4\froman\fprq0\fcharset1 LucidaGrande;}{\f5\froman\fprq0\fcharset1 Liberation Serif{\*\falt Times New Roman};}{\f6\fswiss\fprq0\fcharset1 Liberation Sans{\*\falt Arial};}{\f7\fnil\fprq2\fcharset0 Droid Sans Fallback;}{\f8\fnil\fprq2\fcharset0 Arial;}{\f9\fswiss\fprq0\fcharset1 FreeSans;}{\f10\fnil\fprq0\fcharset1 FreeSans;}}
-{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
-{\stylesheet{\s0\snext0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084 Normal;}
-{\s15\sbasedon0\snext16\ql\nowidctlpar\sb240\sa120\keepn\ltrpar\cf1\kerning1\dbch\af7\langfe2052\dbch\af10\afs28\alang1081\loch\f6\fs28\lang3084 Heading;}
-{\s16\sbasedon0\snext16\sl288\slmult1\ql\nowidctlpar\sb0\sa140\ltrpar\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084 Text Body;}
-{\s17\sbasedon16\snext17\sl288\slmult1\ql\nowidctlpar\sb0\sa140\ltrpar\cf1\kerning1\dbch\af8\langfe2052\dbch\af9\afs24\alang1081\loch\f5\fs24\lang3084 List;}
-{\s18\sbasedon0\snext18\ql\nowidctlpar\sb120\sa120\noline\ltrpar\cf1\i\kerning1\dbch\af8\langfe2052\dbch\af9\afs24\alang1081\ai\loch\f5\fs24\lang3084 Caption;}
-{\s19\sbasedon0\snext19\ql\nowidctlpar\noline\ltrpar\cf1\kerning1\dbch\af8\langfe2052\dbch\af9\afs24\alang1081\loch\f5\fs24\lang3084 Index;}
-}{\info{\creatim\yr0\mo0\dy0\hr0\min0}{\revtim\yr0\mo0\dy0\hr0\min0}{\printim\yr0\mo0\dy0\hr0\min0}{\comment LibreOffice}{\vern67240962}}\deftab720
-=======
{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f4\fswiss\fprq2\fcharset0 Liberation Sans{\*\falt Arial};}{\f5\froman\fprq2\fcharset0 LucidaGrande;}{\f6\fnil\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f7\fnil\fprq2\fcharset0 FreeSans;}{\f8\fswiss\fprq0\fcharset128 FreeSans;}}
{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
{\stylesheet{\s0\snext0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af6\langfe1081\dbch\af6\afs24\alang1081\loch\f3\fs24\lang3084 Normal;}
@@ -19,79 +8,10 @@
{\s18\sbasedon0\snext18\ql\nowidctlpar\sb120\sa120\noline\ltrpar\cf1\i\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\ai\loch\f3\fs24\lang3084 Caption;}
{\s19\sbasedon0\snext19\ql\nowidctlpar\noline\ltrpar\cf1\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\loch\f3\fs24\lang3084 Index;}
}{\info{\creatim\yr0\mo0\dy0\hr0\min0}{\author olivier }{\revtim\yr2015\mo1\dy29\hr19\min33}{\printim\yr0\mo0\dy0\hr0\min0}{\comment LibreOffice}{\vern67306242}}\deftab720
->>>>>>> upstream/0.7.4
\viewscale100
{\*\pgdsctbl
{\pgdsc0\pgdscuse451\pgwsxn12240\pghsxn15840\marglsxn1440\margrsxn1440\margtsxn1440\margbsxn1440\pgdscnxt0 Default Style;}}
\formshade{\*\pgdscno0}\paperh15840\paperw12240\margl1440\margr1440\margt1440\margb1440\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1440\margrsxn1440\margtsxn1440\margbsxn1440\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
-<<<<<<< HEAD
-\pgndec\pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\rtlch \ltrch\loch\fs26\loch\f4
-Python-}{\rtlch \ltrch\loch\fs26\loch\f4
-pyo (version 0.7.0)}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\rtlch \ltrch\loch\fs26\loch\f4
-
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\rtlch \ltrch\loch\fs26\loch\f4
-System requirements : OS X 10.6 to 10.}{\rtlch \ltrch\loch\fs26\loch\f4
-9}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\rtlch \ltrch\loch\fs26\loch\f4
-
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\rtlch \ltrch\loch\fs26\loch\f4
-This package installs all the required components to run pyo inside your current Python installation. Python 2.6 or 2.7 (32/64 bit) must be already installed on your system.}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\rtlch \ltrch\loch\fs26\loch\f4
-
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\rtlch \ltrch\loch\fs26\loch\f4
-This package is divided into two separate installers. If you do not require one of them, please unselect the package in custom installation mode.}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\rtlch \ltrch\loch\fs26\loch\f4
-
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b\rtlch \ltrch\loch\fs26\loch\f4
-1. pyo extension:}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-The following components will be installed in the site-packages folder of the current Python Framework:}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\b0\rtlch \ltrch\loch\fs26\loch\f4
-
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-_pyo.so}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-_pyo64.so}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-pyo.py}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-pyo64.py}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-pyolib (folder)}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\b0\rtlch \ltrch\loch\fs26\loch\f4
-
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b\rtlch \ltrch\loch\fs26\loch\f4
-2. Support libraries (i386 and x86_64):}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-This component will install a number of dynamic libraries on which pyo depends. If you already have these, then you can skip this installation.}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\b0\rtlch \ltrch\loch\fs26\loch\f4
-
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b\rtlch \ltrch\loch\fs26\loch\f4
-Warning:}{\b0\rtlch \ltrch\loch\fs26\loch\f4
- this installation will overwrite any previously installed libraries. These are the libraries that will be installed in your /usr/local/lib directory:}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\b0\rtlch \ltrch\loch\fs26\loch\f4
-
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-liblo.7.dylib}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-libportaudio.2.dylib}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-libportmidi.dylib}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-libsndfile.1.dylib}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-libFLAC.8.dylib}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-libvorbisenc.2.dylib}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-libvorbis.0.dylib}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\b0\rtlch \ltrch\loch\fs26\loch\f4
-libogg.0.dylib}
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\b0\rtlch \ltrch\loch\fs26\loch\f4
-
-\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f5\fs24\lang3084\ql{\b0\rtlch \ltrch\loch\fs26\loch\f4
-=======
{\*\ftnsep}\pgndec\pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af6\langfe1081\dbch\af6\afs24\alang1081\loch\f3\fs24\lang3084\ql\nowidctlpar\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720{\cf1\kerning1\dbch\af6\langfe1081\rtlch \ltrch\loch\fs26\lang3084\loch\f5
Python-pyo (version 0.7.}{\cf1\kerning1\dbch\af6\langfe1081\rtlch \ltrch\loch\fs26\lang3084\loch\f5
4}{\cf1\kerning1\dbch\af6\langfe1081\rtlch \ltrch\loch\fs26\lang3084\loch\f5
@@ -158,6 +78,5 @@ libogg.0.dylib}
\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af6\langfe1081\dbch\af6\afs24\alang1081\loch\f3\fs24\lang3084\ql\nowidctlpar\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\cf1\b0\kerning1\dbch\af6\langfe1081\rtlch \ltrch\loch\fs26\lang3084\loch\f5
\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af6\langfe1081\dbch\af6\afs24\alang1081\loch\f3\fs24\lang3084\ql\nowidctlpar{\cf1\b0\kerning1\dbch\af6\langfe1081\rtlch \ltrch\loch\fs26\lang3084\loch\f5
->>>>>>> upstream/0.7.4
Olivier B\u233\'e9langer, 2014}
\par }
\ No newline at end of file
diff --git a/installers/osx/release_x86_64.sh b/installers/osx/release_x86_64.sh
index dce4cb5..c8bcfad 100644
--- a/installers/osx/release_x86_64.sh
+++ b/installers/osx/release_x86_64.sh
@@ -8,15 +8,9 @@
# 5. install python (and wxpython) 2.7 (64-bit)
# 6. cd installer/osx and build the realease, only x86_64 version
-<<<<<<< HEAD
-export PACKAGE_NAME=pyo_0.7.0_x86_64.pkg
-export DMG_DIR="pyo 0.7.0 Universal"
-export DMG_NAME="pyo_0.7.0_OSX-universal.dmg"
-=======
export PACKAGE_NAME=pyo_0.7.4_x86_64.pkg
export DMG_DIR="pyo 0.7.4 Universal"
export DMG_NAME="pyo_0.7.4_OSX-universal.dmg"
->>>>>>> upstream/0.7.4
export INSTALLER_DIR=`pwd`/installer
export PYO_MODULE_DIR=$INSTALLER_DIR/PyoModule/Package_Contents/tmp
export SUPPORT_LIBS_DIR=$INSTALLER_DIR/SupportLibs/Package_Contents/usr/local/lib
diff --git a/installers/win/win_installer_py26.iss b/installers/win/win_installer_py26.iss
index 792ba48..f973793 100644
--- a/installers/win/win_installer_py26.iss
+++ b/installers/win/win_installer_py26.iss
@@ -9,21 +9,6 @@
; NOTE: The value of AppId uniquely identifies this application.
; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-<<<<<<< HEAD
-AppId={{4F72B6EF-CFA0-434F-A2B4-B130F94F54EB}
-AppName=Pyo
-AppVersion=0.7.0
-AppPublisher=iACT.umontreal.ca
-AppPublisherURL=http://code.google.com/p/pyo
-AppSupportURL=http://code.google.com/p/pyo
-AppUpdatesURL=http://code.google.com/p/pyo
-DefaultDirName={sd}\Python26
-DisableDirPage=yes
-DefaultGroupName=pyo
-AllowNoIcons=yes
-InfoBeforeFile=C:\Users\olipet\svn\pyo\installers\win\\README-win32-py26.txt
-OutputBaseFilename=pyo_0.7.0_py2.6_setup
-=======
AppId={{AC79C5C4-BE36-419E-B94A-98C6D0DCF4B9}
AppName={#appName}
AppVersion={#appVer}
@@ -39,7 +24,6 @@ AllowNoIcons=yes
InfoBeforeFile=C:\Users\olipet\svn\pyo\installers\win\\README-win32-py26.txt
LicenseFile=C:\Users\olipet\svn\pyo\COPYING.txt
OutputBaseFilename={#appName}_{#appVer}_py{#pyVer}_setup
->>>>>>> upstream/0.7.4
Compression=lzma
SolidCompression=yes
ChangesAssociations=yes
@@ -52,23 +36,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
; should use PYTHONPATH variable
[Files]
-<<<<<<< HEAD
-Source: "C:\Python26\Lib\site-packages\pyo.py"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\pyo64.py"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\pyolib\*"; DestDir: "{sd}\Python26\Lib\site-packages\pyolib"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Python26\Lib\site-packages\_pyo.pyd"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\_pyo64.pyd"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\libsndfile-1.dll"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\lo.dll"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\portaudio.dll"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\portmidi.dll"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\porttime.dll"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\pthreadVC2.dll"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\msvcr90.dll"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\MinGW\bin\libgcc_s_dw2-1.dll"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\MinGW\bin\libstdc++-6.dll"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\pyo-0.7.0-py2.6.egg-info"; DestDir: "{sd}\Python26\Lib\site-packages"; Flags: ignoreversion
-=======
Source: "C:\Python26\Lib\site-packages\pyo.py"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
Source: "C:\Python26\Lib\site-packages\pyo64.py"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
Source: "C:\Python26\Lib\site-packages\pyolib\*"; DestDir: "{app}\Lib\site-packages\pyolib"; Flags: ignoreversion recursesubdirs createallsubdirs
@@ -84,7 +51,6 @@ Source: "C:\Python26\Lib\site-packages\msvcr90.dll"; DestDir: "{app}\Lib\site-pa
Source: "C:\MinGW\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
Source: "C:\MinGW\bin\libstdc++-6.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
Source: "C:\Python26\Lib\site-packages\pyo-{#appVer}-py{#pyVer}.egg-info"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
->>>>>>> upstream/0.7.4
Source: "C:\Users\olipet\svn\pyo\examples\*"; DestDir: "{userdesktop}\pyo_examples\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\Users\olipet\svn\pyo\installers\win\README-win32-py26.txt"; DestDir: "{userdesktop}"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
diff --git a/installers/win/win_installer_py27.iss b/installers/win/win_installer_py27.iss
index 722cb41..5935569 100644
--- a/installers/win/win_installer_py27.iss
+++ b/installers/win/win_installer_py27.iss
@@ -9,15 +9,9 @@
; NOTE: The value of AppId uniquely identifies this application.
; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-<<<<<<< HEAD
-AppId={{244D309A-C251-481A-AD24-0602D392A634}
-AppName=Pyo
-AppVersion=0.7.0
-=======
AppId={{59447873-F994-4BC7-8B1D-0DDCA5B6AFFD}
AppName={#appName}
AppVersion={#appVer}
->>>>>>> upstream/0.7.4
AppPublisher=iACT.umontreal.ca
AppPublisherURL=http://code.google.com/p/pyo
AppSupportURL=http://code.google.com/p/pyo
@@ -27,14 +21,9 @@ DisableDirPage=no
AlwaysShowDirOnReadyPage=yes
DefaultGroupName={#appName}
AllowNoIcons=yes
-<<<<<<< HEAD
-InfoBeforeFile=C:\Users\olipet\svn\pyo\installers\win\\README-win32-py27.txt
-OutputBaseFilename=pyo_0.7.0_py2.7_setup
-=======
InfoBeforeFile=C:\Users\olipet\svn\pyo\installers\win\\README-win32-py27.txt
LicenseFile=C:\Users\olipet\svn\pyo\COPYING.txt
OutputBaseFilename={#appName}_{#appVer}_py{#pyVer}_setup
->>>>>>> upstream/0.7.4
Compression=lzma
SolidCompression=yes
ChangesAssociations=yes
@@ -45,29 +34,7 @@ SetupIconFile=C:\Users\olipet\svn\pyo\utils\E-PyoIcon.ico
[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
-; One installer for both python version
-; functions to set which python directory in Setup section
-; Check: DirExists(ExpandConstant('{sd}\Python27'))
[Files]
-<<<<<<< HEAD
-Source: "C:\Python27\Lib\site-packages\pyo.py"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\pyo64.py"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\pyolib\*"; DestDir: "{sd}\Python27\Lib\site-packages\pyolib"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Python27\Lib\site-packages\_pyo.pyd"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\_pyo64.pyd"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\libsndfile-1.dll"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\lo.dll"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\portaudio.dll"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\portmidi.dll"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\porttime.dll"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\pthreadVC2.dll"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\msvcr90.dll"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\MinGW\bin\libgcc_s_dw2-1.dll"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\MinGW\bin\libstdc++-6.dll"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\pyo-0.7.0-py2.7.egg-info"; DestDir: "{sd}\Python27\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Users\olipet\svn\pyo\examples\*"; DestDir: "{userdesktop}\pyo_examples\"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\olipet\svn\pyo\installers\win\README-win32-py27.txt"; DestDir: "{userdesktop}"; Flags: ignoreversion
-=======
Source: "C:\Python27\Lib\site-packages\pyo.py"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
Source: "C:\Python27\Lib\site-packages\pyo64.py"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
Source: "C:\Python27\Lib\site-packages\pyolib\*"; DestDir: "{app}\Lib\site-packages\pyolib"; Flags: ignoreversion recursesubdirs createallsubdirs
@@ -84,7 +51,6 @@ Source: "C:\MinGW\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}\Lib\site-packages"; F
Source: "C:\MinGW\bin\libstdc++-6.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
Source: "C:\Python27\Lib\site-packages\pyo-{#appVer}-py{#pyVer}.egg-info"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
Source: "C:\Users\olipet\svn\pyo\examples\*"; DestDir: "{userdesktop}\pyo_examples\"; Flags: ignoreversion recursesubdirs createallsubdirs
->>>>>>> upstream/0.7.4
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
; E-Pyo stuff
diff --git a/pyo.py b/pyo.py
index bd9e4f4..02421c5 100644
--- a/pyo.py
+++ b/pyo.py
@@ -319,11 +319,7 @@ OBJECTS_TREE = {'functions': sorted(['pa_count_devices', 'pa_get_default_input',
'getVersion', 'reducePoints', 'serverCreated', 'serverBooted', 'distanceToSegment', 'rescale',
'upsamp', 'downsamp', 'linToCosCurve', 'convertStringToSysEncoding', 'savefileFromTable',
'pa_get_input_max_channels', 'pa_get_output_max_channels', 'pa_get_devices_infos', 'pa_get_version',
-<<<<<<< HEAD
- 'pa_get_version_text']),
-=======
'pa_get_version_text', 'floatmap']),
->>>>>>> upstream/0.7.4
'PyoObjectBase': {
'PyoMatrixObject': sorted(['NewMatrix']),
'PyoTableObject': sorted(['LinTable', 'NewTable', 'SndTable', 'HannTable', 'HarmTable', 'SawTable', 'ParaTable', 'LogTable', 'CosLogTable',
@@ -334,11 +330,7 @@ OBJECTS_TREE = {'functions': sorted(['pa_count_devices', 'pa_get_default_input',
'Ceil', 'Tanh']),
'controls': sorted(['Fader', 'Sig', 'SigTo', 'Adsr', 'Linseg', 'Expseg']),
'dynamics': sorted(['Clip', 'Compress', 'Degrade', 'Mirror', 'Wrap', 'Gate', 'Balance', 'Min', 'Max']),
-<<<<<<< HEAD
- 'effects': sorted(['Delay', 'SDelay', 'Disto', 'Freeverb', 'Waveguide', 'Convolve', 'WGVerb',
-=======
'effects': sorted(['Delay', 'SDelay', 'Disto', 'Freeverb', 'Waveguide', 'Convolve', 'WGVerb', 'SmoothDelay',
->>>>>>> upstream/0.7.4
'Harmonizer', 'Chorus', 'AllpassWG', 'FreqShift', 'Vocoder', 'Delay1', 'STRev']),
'filters': sorted(['Biquad', 'BandSplit', 'Port', 'Hilbert', 'Tone', 'DCBlock', 'EQ', 'Allpass',
'Allpass2', 'Phaser', 'Biquadx', 'IRWinSinc', 'IRAverage', 'IRPulse', 'IRFM', 'FourBand',
@@ -353,11 +345,7 @@ OBJECTS_TREE = {'functions': sorted(['pa_count_devices', 'pa_get_default_input',
'randoms': sorted(['Randi', 'Randh', 'Choice', 'RandInt', 'Xnoise', 'XnoiseMidi', 'RandDur', 'XnoiseDur', 'Urn']),
'players': sorted(['SfMarkerShuffler', 'SfPlayer', 'SfMarkerLooper']),
'tableprocess': sorted(['TableRec', 'Osc', 'Pointer', 'Pointer2', 'Lookup', 'Granulator', 'Pulsar', 'OscLoop', 'Granule',
-<<<<<<< HEAD
- 'TableRead', 'TableMorph', 'Looper', 'TableIndex', 'OscBank', 'OscTrig', 'TablePut', 'TableScale']),
-=======
'TableRead', 'TableMorph', 'Looper', 'TableIndex', 'OscBank', 'OscTrig', 'TablePut', 'TableScale', 'Particle']),
->>>>>>> upstream/0.7.4
'matrixprocess': sorted(['MatrixRec', 'MatrixPointer', 'MatrixMorph', 'MatrixRecLoop']),
'triggers': sorted(['Metro', 'Beat', 'TrigEnv', 'TrigRand', 'TrigRandInt', 'Select', 'Counter', 'TrigChoice',
'TrigFunc', 'Thresh', 'Cloud', 'Trig', 'TrigXnoise', 'TrigXnoiseMidi', 'Timer', 'Count',
@@ -365,13 +353,8 @@ OBJECTS_TREE = {'functions': sorted(['pa_count_devices', 'pa_get_default_input',
'TrigVal', 'Euclide', 'TrigBurst']),
'utils': sorted(['Clean_objects', 'Print', 'Snap', 'Interp', 'SampHold', 'Compare', 'Record', 'Between', 'Denorm',
'ControlRec', 'ControlRead', 'NoteinRec', 'NoteinRead', 'DBToA', 'AToDB', 'Scale', 'CentsToTranspo',
-<<<<<<< HEAD
- 'TranspoToCents', 'MToF', 'MToT', 'TrackHold']),
- 'fourier': sorted(['FFT', 'IFFT', 'CarToPol', 'PolToCar', 'FrameDelta', 'FrameAccum', 'Vectral', 'CvlVerb', 'Spectrum'])}},
-=======
'TranspoToCents', 'MToF', 'FToM', 'MToT', 'TrackHold']),
'fourier': sorted(['FFT', 'IFFT', 'CarToPol', 'PolToCar', 'FrameDelta', 'FrameAccum', 'Vectral', 'CvlVerb'])}},
->>>>>>> upstream/0.7.4
'Map': {'SLMap': sorted(['SLMapFreq', 'SLMapMul', 'SLMapPhase', 'SLMapQ', 'SLMapDur', 'SLMapPan'])},
'Server': [],
'Stream': [],
diff --git a/pyolib/_widgets.py b/pyolib/_widgets.py
index 0902617..40bded2 100644
--- a/pyolib/_widgets.py
+++ b/pyolib/_widgets.py
@@ -20,7 +20,6 @@ along with pyo. If not, see <http://www.gnu.org/licenses/>.
"""
from types import ListType, FloatType, IntType
import math, sys, os, random
-import __builtin__
try:
from PIL import Image, ImageDraw, ImageTk
@@ -41,12 +40,6 @@ try:
except:
PYO_USE_WX = False
-<<<<<<< HEAD
-if hasattr(__builtin__, 'EPYO_APP_OPENED'):
- PYO_USE_WX = True
-
-=======
->>>>>>> upstream/0.7.4
PYO_USE_TK = False
if not PYO_USE_WX:
try:
@@ -78,10 +71,7 @@ TABLEWINDOWS = []
SNDTABLEWINDOWS = []
MATRIXWINDOWS = []
SPECTRUMWINDOWS = []
-<<<<<<< HEAD
-=======
SCOPEWINDOWS = []
->>>>>>> upstream/0.7.4
WX_APP = False
def createRootWindow():
diff --git a/pyolib/_wxwidgets.py b/pyolib/_wxwidgets.py
index 17c220f..9fed692 100644
--- a/pyolib/_wxwidgets.py
+++ b/pyolib/_wxwidgets.py
@@ -156,40 +156,8 @@ class ControlSlider(wx.Panel):
self.sliderHeight = height
self.Refresh()
-<<<<<<< HEAD
- def createSliderBitmap(self):
- w, h = self.GetSize()
- b = wx.EmptyBitmap(w,h)
- dc = wx.MemoryDC(b)
- gc = wx.GraphicsContext_Create(dc)
- dc.SetPen(wx.Pen(self.backgroundColour, width=1))
- dc.SetBrush(wx.Brush(self.backgroundColour))
- dc.DrawRectangle(0,0,w,h)
- gc.SetBrush(wx.Brush("#999999"))
- gc.SetPen(wx.Pen(self.backgroundColour, width=1))
- h2 = self.sliderHeight / 4
- gc.DrawRoundedRectangle(0,h2,w,self.sliderHeight,2)
- dc.SelectObject(wx.NullBitmap)
- b.SetMaskColour("#999999")
- self.sliderMask = b
-
- def createKnobBitmap(self):
- w, h = self.knobSize, self.GetSize()[1]
- b = wx.EmptyBitmap(w,h)
- dc = wx.MemoryDC(b)
- gc = wx.GraphicsContext_Create(dc)
- dc.SetPen(wx.Pen(self.backgroundColour, width=1))
- dc.SetBrush(wx.Brush(self.backgroundColour))
- dc.DrawRectangle(0, 0, w, h)
- gc.SetBrush(wx.Brush("#999999"))
- gc.DrawRoundedRectangle(0,0,w,h,3)
- dc.SelectObject(wx.NullBitmap)
- b.SetMaskColour("#999999")
- self.knobMask = b
-=======
def setSliderWidth(self, width):
self.sliderWidth = width
->>>>>>> upstream/0.7.4
def getInit(self):
return self.init
@@ -381,17 +349,6 @@ class ControlSlider(wx.Panel):
# Draw knob
if self._enable: knobColour = '#888888'
else: knobColour = "#DDDDDD"
-<<<<<<< HEAD
- rec = wx.Rect(self.pos-self.knobHalfSize, 0, self.knobSize-1, h)
- dc.GradientFillLinear(rec, "#424864", knobColour, wx.RIGHT)
- dc.DrawBitmap(self.knobMask, rec[0], rec[1], True)
-
- if self.selected:
- rec2 = wx.Rect(self.pos-self.knobHalfSize, 0, self.knobSize, h)
- dc.SetBrush(wx.Brush('#333333', wx.SOLID))
- dc.SetPen(wx.Pen('#333333', width=self.borderWidth, style=wx.SOLID))
- dc.DrawRoundedRectangleRect(rec2, 3)
-=======
if self.orient == wx.VERTICAL:
rec = wx.Rect(0, self.pos-self.knobHalfSize, w, self.knobSize-1)
if self.selected:
@@ -408,7 +365,6 @@ class ControlSlider(wx.Panel):
brush = gc.CreateLinearGradientBrush(self.pos-self.knobHalfSize, 0, self.pos+self.knobHalfSize, 0, "#323854", knobColour)
gc.SetBrush(brush)
gc.DrawRoundedRectangle(rec[0], rec[1], rec[2], rec[3], 3)
->>>>>>> upstream/0.7.4
if sys.platform in ['win32', 'linux2']:
dc.SetFont(wx.Font(7, wx.ROMAN, wx.NORMAL, wx.NORMAL))
@@ -628,16 +584,6 @@ class VuMeter(wx.Panel):
dc.SetBrush(wx.Brush("#000000"))
dc.Clear()
dc.DrawRectangle(0,0,w,h)
-<<<<<<< HEAD
- for i in range(self.numSliders):
- db = math.log10(self.amplitude[i]+0.00001) * 0.2 + 1.
- width = int(db*w)
- dc.DrawBitmap(self.backBitmap, 0, i*5)
- if width > 0:
- dc.SetClippingRegion(0, i*5, width, 5)
- dc.DrawBitmap(self.bitmap, 0, i*5)
- dc.DestroyClippingRegion()
-=======
if self.orient == wx.HORIZONTAL:
height = 6
for i in range(self.numSliders):
@@ -660,7 +606,6 @@ class VuMeter(wx.Panel):
dc.SetClippingRegion(y, h-height, width, height)
dc.DrawBitmap(self.bitmap, y, 0)
dc.DestroyClippingRegion()
->>>>>>> upstream/0.7.4
event.Skip()
def OnClose(self, evt):
@@ -1031,21 +976,6 @@ class ViewTable(wx.Frame):
def _destroy(self, evt):
self.object._setViewFrame(None)
self.Destroy()
-<<<<<<< HEAD
-
-class ViewTablePanel(wx.Panel):
- def __init__(self, parent, obj):
- wx.Panel.__init__(self, parent)
- self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
- self.obj = obj
- self.samples = []
- self.Bind(wx.EVT_PAINT, self.OnPaint)
- self.Bind(wx.EVT_SIZE, self.OnSize)
- if sys.platform == "win32":
- self.dcref = wx.BufferedPaintDC
- else:
- self.dcref = wx.PaintDC
-=======
class ViewTablePanel(wx.Panel):
def __init__(self, parent, obj):
@@ -1060,7 +990,6 @@ class ViewTablePanel(wx.Panel):
else:
self.dcref = wx.PaintDC
->>>>>>> upstream/0.7.4
def draw(self, samples):
self.samples = samples
diff --git a/pyolib/effects.py b/pyolib/effects.py
index 2f81f40..cfde21c 100644
--- a/pyolib/effects.py
+++ b/pyolib/effects.py
@@ -1480,8 +1480,6 @@ class STRev(PyoObject):
return self._firstRefGain
@firstRefGain.setter
def firstRefGain(self, x): self.setFirstRefGain(x)
-<<<<<<< HEAD
-=======
class SmoothDelay(PyoObject):
"""
@@ -1635,4 +1633,3 @@ class SmoothDelay(PyoObject):
return self._crossfade
@crossfade.setter
def crossfade(self, x): self.setCrossfade(x)
->>>>>>> upstream/0.7.4
diff --git a/scripts/release_doc_src.sh b/scripts/release_doc_src.sh
index 56581fe..78c8449 100644
--- a/scripts/release_doc_src.sh
+++ b/scripts/release_doc_src.sh
@@ -6,11 +6,7 @@
# 3. Execute from pyo folder : ./scripts/release_doc_src.sh
#
-<<<<<<< HEAD
-version=0.7.0
-=======
version=0.7.4
->>>>>>> upstream/0.7.4
replace=XXX
doc_rep=pyo_XXX-doc
diff --git a/setup.py b/setup.py
index 952ab73..d67d090 100644
--- a/setup.py
+++ b/setup.py
@@ -23,11 +23,7 @@ from distutils.core import setup, Extension
import os, sys, getopt
import time
-<<<<<<< HEAD
-pyo_version = "0.7.0"
-=======
pyo_version = "0.7.4"
->>>>>>> upstream/0.7.4
build_osx_with_jack_support = False
compile_externals = False
@@ -72,11 +68,7 @@ files = ['pyomodule.c', 'servermodule.c', 'pvstreammodule.c', 'streammodule.c',
source_files = [path + f for f in files]
path = 'src/objects/'
-<<<<<<< HEAD
-files = ['tablemodule.c', 'wgverbmodule.c', 'freeverbmodule.c', 'phasevocmodule.c', 'fftmodule.c',
-=======
files = ['granulatormodule.c', 'tablemodule.c', 'wgverbmodule.c', 'freeverbmodule.c', 'phasevocmodule.c', 'fftmodule.c',
->>>>>>> upstream/0.7.4
'oscilmodule.c', 'randommodule.c', 'oscmodule.c','analysismodule.c',
'sfplayermodule.c', 'oscbankmodule.c', 'lfomodule.c',
'matrixmodule.c', 'filtremodule.c', 'noisemodule.c', 'distomodule.c',
diff --git a/src/engine/pyomodule.c b/src/engine/pyomodule.c
index 1c64f4f..24c05c5 100644
--- a/src/engine/pyomodule.c
+++ b/src/engine/pyomodule.c
@@ -2526,8 +2526,6 @@ init_pyo64(void)
module_add_object(m, "STReverb_base", &STReverbType);
module_add_object(m, "STRev_base", &STRevType);
module_add_object(m, "Pointer2_base", &Pointer2Type);
-<<<<<<< HEAD
-=======
module_add_object(m, "Centroid_base", &CentroidType);
module_add_object(m, "AttackDetector_base", &AttackDetectorType);
module_add_object(m, "SmoothDelay_base", &SmoothDelayType);
@@ -2541,7 +2539,6 @@ init_pyo64(void)
module_add_object(m, "PeakAmp_base", &PeakAmpType);
module_add_object(m, "MainParticle_base", &MainParticleType);
module_add_object(m, "Particle_base", &ParticleType);
->>>>>>> upstream/0.7.4
PyModule_AddStringConstant(m, "PYO_VERSION", PYO_VERSION);
#ifdef COMPILE_EXTERNALS
diff --git a/src/objects/fadermodule.c b/src/objects/fadermodule.c
index 738a0ba..bd6310e 100644
--- a/src/objects/fadermodule.c
+++ b/src/objects/fadermodule.c
@@ -63,11 +63,7 @@ Fader_generate_auto(Fader *self) {
val = self->currentTime / self->attack;
else if (self->currentTime > self->duration) {
val = 0.;
-<<<<<<< HEAD
- Fader_internal_stop((Fader *)self);
-=======
self->ended = 1;
->>>>>>> upstream/0.7.4
}
else if (self->currentTime >= (self->duration - self->release))
val = (self->duration - self->currentTime) / self->release;
diff --git a/utils/E-Pyo.py b/utils/E-Pyo.py
index af435fe..dfb2ae7 100755
--- a/utils/E-Pyo.py
+++ b/utils/E-Pyo.py
@@ -17,17 +17,11 @@ import __builtin__
__builtin__.EPYO_APP_OPENED = True
if sys.platform == "linux2":
-<<<<<<< HEAD
- WX_VERSION = '3.0'
- import wxversion
- wxversion.select(WX_VERSION)
-=======
import wxversion
if wxversion.checkInstalled("3.0"):
wxversion.select("3.0")
elif wxversion.checkInstalled("2.8"):
wxversion.select("2.8")
->>>>>>> upstream/0.7.4
import os, string, inspect, keyword, wx, codecs, subprocess, unicodedata
import contextlib, StringIO, shutil, copy, pprint, random, time, threading
@@ -39,11 +33,7 @@ import wx.lib.scrolledpanel as scrolled
import wx.lib.dialogs
import wx.combo
import wx.stc as stc
-<<<<<<< HEAD
-import FlatNotebook as FNB
-=======
import wx.lib.agw.flatnotebook as FNB
->>>>>>> upstream/0.7.4
from pyo import *
from PyoDoc import ManualFrame
@@ -749,13 +739,9 @@ KEY_COMMANDS = {
"31. Alt + 'V'": "Line Paste",
"32. Alt + CLICK + DRAG": "Rectangular selection",
"33. Shit + Return": "Show the init line of a pyo object in a tooltip",
-<<<<<<< HEAD
-"34. Ctrl/Cmd + Return": "Show the __doc__ string of a python object, module or function"
-=======
"34. Ctrl/Cmd + Return": "Show the __doc__ string of a python object, module or function",
"35. CLICK in the most left margin": "Add a marker to the corresponding line",
"36. Shift + CLICK on a marker": "Delete the marker"
->>>>>>> upstream/0.7.4
}
############## Allowed Extensions ##############
@@ -1979,11 +1965,8 @@ class MainFrame(wx.Frame):
self.Bind(wx.EVT_MENU, self.save, id=wx.ID_SAVE)
menu1.Append(wx.ID_SAVEAS, "Save As...\tShift+Ctrl+S")
self.Bind(wx.EVT_MENU, self.saveas, id=wx.ID_SAVEAS)
-<<<<<<< HEAD
-=======
menu1.Append(100, "Save As Template...")
self.Bind(wx.EVT_MENU, self.saveasTemplate, id=100)
->>>>>>> upstream/0.7.4
# TODO : printing not working well enough
#menu1.AppendSeparator()
#menu1.Append(wx.ID_PREVIEW, "Print Preview")
@@ -2511,12 +2494,6 @@ class MainFrame(wx.Frame):
self.panel.editor.FoldAll()
else:
self.panel.editor.ExpandAll()
-<<<<<<< HEAD
-
- def foldExpandScope(self, evt):
- self.panel.editor.foldExpandCurrentScope()
-=======
->>>>>>> upstream/0.7.4
def foldExpandScope(self, evt):
self.panel.editor.foldExpandCurrentScope()
@@ -3334,12 +3311,8 @@ class MainPanel(wx.Panel):
#######################################################
### The idea of EditorPanel is to allow multiple views
-<<<<<<< HEAD
-### at the same time in a single notebook page.
-=======
### at the same time in a single notebook page.
### Also: A tree view of classes and functions of the file
->>>>>>> upstream/0.7.4
### Not yet implemented... ( TODO )
#######################################################
class EditorPanel(wx.Panel):
@@ -3513,13 +3486,10 @@ class Editor(stc.StyledTextCtrl):
fline = fline.replace("/", " ")
last = fline.split()[-1]
ext = {"python": "py", "bash": "sh", "sh": "sh"}.get(last, "")
-<<<<<<< HEAD
-=======
else:
text = f.read()
if "desc:" in text:
ext = "jsfx"
->>>>>>> upstream/0.7.4
except:
pass
if ext in ["py", "pyw", "c5"]:
@@ -3541,7 +3511,7 @@ class Editor(stc.StyledTextCtrl):
self.StyleSetSpec(stc.STC_P_OPERATOR, buildStyle('operator'))
self.StyleSetSpec(stc.STC_P_IDENTIFIER, buildStyle('default'))
self.StyleSetSpec(stc.STC_P_COMMENTBLOCK, buildStyle('commentblock'))
- elif ext in ["c", "cc", "cpp", "cxx", "cs", "h", "hh", "hpp", "hxx", "jsfx-inc"]:
+ elif ext in ["c", "cc", "cpp", "cxx", "cs", "h", "hh", "hpp", "hxx"]:
self.SetLexer(stc.STC_LEX_CPP)
self.SetStyleBits(self.GetStyleBitsNeeded())
self.SetProperty('fold.comment', '1')
@@ -3701,14 +3671,6 @@ class Editor(stc.StyledTextCtrl):
self.anchor1 = startpos = selection[0]
self.anchor2 = selection[1]
while startpos != -1:
-<<<<<<< HEAD
- startpos = self.FindText(self.anchor1, self.anchor2, findTxt)
- if startpos != -1:
- endpos = startpos+len(findTxt)
- self.SetSelection(startpos, endpos)
- self.ReplaceSelection(evt.GetReplaceString())
- self.anchor1 = endpos + 1
-=======
startpos = self.FindText(self.anchor1, self.anchor2, findTxt, evt.GetFlags())
if startpos != -1:
endpos = startpos+len(findTxt)
@@ -3716,7 +3678,6 @@ class Editor(stc.StyledTextCtrl):
self.ReplaceSelection(newTxt)
self.anchor1 = startpos + newStrLen + 1
self.anchor2 += diffLen
->>>>>>> upstream/0.7.4
line = self.GetCurrentLine()
halfNumLinesOnScreen = self.LinesOnScreen() / 2
self.ScrollToLine(line - halfNumLinesOnScreen)
@@ -4121,27 +4082,6 @@ class Editor(stc.StyledTextCtrl):
dlg.ShowModal()
except:
pass
-<<<<<<< HEAD
-
- def navigateMarkers(self, down=True):
- if self.markers_dict != {}:
- llen = len(self.markers_dict)
- keys = sorted(self.markers_dict.keys())
- if down:
- self.current_marker += 1
- else:
- self.current_marker -= 1
- if self.current_marker < 0:
- self.current_marker = llen - 1
- elif self.current_marker >= llen:
- self.current_marker = 0
- line = keys[self.current_marker]
- self.GotoLine(line)
- halfNumLinesOnScreen = self.LinesOnScreen() / 2
- self.ScrollToLine(line - halfNumLinesOnScreen)
- self.GetParent().GetParent().GetParent().GetParent().markers.setSelected(self.current_marker)
-=======
->>>>>>> upstream/0.7.4
def OnChar(self, evt):
propagate = True
@@ -4462,21 +4402,6 @@ class Editor(stc.StyledTextCtrl):
if lastChild > lineNum:
self.HideLines(lineNum+1, lastChild)
lineNum = lineNum + 1
-<<<<<<< HEAD
-
- def ExpandAll(self):
- lineCount = self.GetLineCount()
- lineNum = 0
- while lineNum < lineCount:
- level = self.GetFoldLevel(lineNum)
- if level & stc.STC_FOLDLEVELHEADERFLAG and \
- (level & stc.STC_FOLDLEVELNUMBERMASK) == stc.STC_FOLDLEVELBASE:
- self.SetFoldExpanded(lineNum, True)
- lineNum = self.Expand(lineNum, True)
- lineNum = lineNum - 1
- lineNum = lineNum + 1
-
-=======
def ExpandAll(self):
lineCount = self.GetLineCount()
@@ -4490,7 +4415,6 @@ class Editor(stc.StyledTextCtrl):
lineNum = lineNum - 1
lineNum = lineNum + 1
->>>>>>> upstream/0.7.4
def ToggleFoldAll(self):
lineCount = self.GetLineCount()
expanding = True
diff --git a/utils/info.plist b/utils/info.plist
index c22e5d2..0abb41b 100644
--- a/utils/info.plist
+++ b/utils/info.plist
@@ -32,29 +32,17 @@
<key>CFBundleIdentifier</key>
<string>org.pythonmac.unspecified.E-Pyo</string>
<key>CFBundleInfoDictionaryVersion</key>
-<<<<<<< HEAD
- <string>0.7.0</string>
-=======
<string>0.7.4</string>
->>>>>>> upstream/0.7.4
<key>CFBundleName</key>
<string>E-Pyo</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
-<<<<<<< HEAD
- <string>0.7.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>0.7.0</string>
-=======
<string>0.7.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.7.4</string>
->>>>>>> upstream/0.7.4
<key>LSHasLocalizedDisplayName</key>
<false/>
<key>NSAppleScriptEnabled</key>
--
python-pyo packaging
More information about the pkg-multimedia-commits
mailing list