[SCM] python-pyo/master: New upstream release - resolving conflicts.
tiago at users.alioth.debian.org
tiago at users.alioth.debian.org
Tue Jul 28 21:25:07 UTC 2015
The following commit has been merged in the master branch:
commit e42351a468b36ebbcf3469590c50025a4d2be85c
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date: Tue Jul 28 17:04:23 2015 -0400
New upstream release - resolving conflicts.
diff --git a/ChangeLog b/ChangeLog
index 8e6cf4c..73619a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,5 @@
-------------------------------------------------------------------------------------
-2015-03-05 belangeo <belangeo at gmail.com>
-<<<<<<< HEAD
-=======
2015-07-27 belangeo <belangeo at gmail.com>
* Final revision for version 0.7.6.
@@ -63,7 +60,6 @@
-------------------------------------------------------------------------------------
2015-03-05 belangeo <belangeo at gmail.com>
->>>>>>> upstream/0.7.6
* Fixed crash when portaudio stream is stopped on OSX (created when fixed
for Windows). Rev 1310 is the sources for 0.7.5 release.
- rev 1310
diff --git a/doc-sphinx/source/index.rst b/doc-sphinx/source/index.rst
index 016575b..c2c953b 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.5 documentation
-=======
Welcome to the Pyo 0.7.6 documentation
->>>>>>> upstream/0.7.6
===================================================
.. toctree::
diff --git a/include/pyomodule.h b/include/pyomodule.h
index 04a0e85..32a3f3c 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.5"
-=======
#define PYO_VERSION "0.7.6"
->>>>>>> upstream/0.7.6
#ifndef __MYFLT_DEF
#define __MYFLT_DEF
@@ -489,10 +485,7 @@ extern PyTypeObject PeakAmpType;
extern PyTypeObject MainParticleType;
extern PyTypeObject ParticleType;
extern PyTypeObject AtanTableType;
-<<<<<<< HEAD
-=======
extern PyTypeObject RawMidiType;
->>>>>>> upstream/0.7.6
/* Constants */
#define E M_E
diff --git a/installers/osx/release_x86_64.sh b/installers/osx/release_x86_64.sh
index a09bb17..2275a10 100644
--- a/installers/osx/release_x86_64.sh
+++ b/installers/osx/release_x86_64.sh
@@ -7,15 +7,9 @@
# 3. cd utils and build E-Pyo
# 4. cd installer/osx and build the realease, only x86_64 version
-<<<<<<< HEAD
-export PACKAGE_NAME=pyo_0.7.5_x86_64.pkg
-export DMG_DIR="pyo 0.7.5 Universal"
-export DMG_NAME="pyo_0.7.5_OSX-universal.dmg"
-=======
export PACKAGE_NAME=pyo_0.7.6_x86_64.pkg
export DMG_DIR="pyo 0.7.6 Universal"
export DMG_NAME="pyo_0.7.6_OSX-universal.dmg"
->>>>>>> upstream/0.7.6
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/README-win32-py26.txt b/installers/win/README-win32-py26.txt
index e60f08e..e482de4 100644
--- a/installers/win/README-win32-py26.txt
+++ b/installers/win/README-win32-py26.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
Pyo is a Python module written in C to help digital signal processing script creation.
* Python 2.6 must be installed on your system before running this installer. *
@@ -20,26 +19,3 @@ python 01_music_box.py
Please, send comments and bugs to:
belangeo at gmail.com
-=======
-Pyo is a Python module written in C to help digital signal processing script creation.
-
-* Python 2.6 must be installed on your system before running this installer. *
-
-http://www.python.org/download/releases/2.6.6/
-
-To use the WxPython toolkit for widgets, you need to install wxPython 3.0 for python 2.6:
-
-http://www.wxpython.org/download.php#stable
-
-This installer will leave a folder called pyo_examples on the Desktop,
-it's a good starting point to explore the library!
-
-In a Command Prompt:
-
-cd Desktop\pyo_examples\algorithmic
-python 01_music_box.py
-
-Please, send comments and bugs to:
-
-belangeo at gmail.com
->>>>>>> upstream/0.7.6
diff --git a/installers/win/README-win32-py27.txt b/installers/win/README-win32-py27.txt
index 3ae160e..eddb84d 100644
--- a/installers/win/README-win32-py27.txt
+++ b/installers/win/README-win32-py27.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
Pyo is a Python module written in C to help digital signal processing script creation.
* Python 2.7 must be installed on your system before running this installer. *
@@ -20,26 +19,3 @@ python 01_music_box.py
Please, send comments and bugs to:
belangeo at gmail.com
-=======
-Pyo is a Python module written in C to help digital signal processing script creation.
-
-* Python 2.7 must be installed on your system before running this installer. *
-
-http://www.python.org/download/
-
-To use the WxPython toolkit for widgets, you need to install wxPython 3.0 for python 2.7:
-
-http://www.wxpython.org/download.php#stable
-
-This installer will leave a folder called pyo_examples on the Desktop,
-it's a good starting point to explore the library!
-
-In a Command Prompt:
-
-cd Desktop\pyo_examples\algorithmic
-python 01_music_box.py
-
-Please, send comments and bugs to:
-
-belangeo at gmail.com
->>>>>>> upstream/0.7.6
diff --git a/installers/win/win_installer_py26.iss b/installers/win/win_installer_py26.iss
index c569ddd..54c1ced 100644
--- a/installers/win/win_installer_py26.iss
+++ b/installers/win/win_installer_py26.iss
@@ -1,30 +1,15 @@
-<<<<<<< HEAD
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define appName "pyo"
#define pyVer "2.6"
-#define appVer "0.7.5"
+#define appVer "0.7.6"
[Setup]
; 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.)
AppId={{AC79C5C4-BE36-419E-B94A-98C6D0DCF4B9}
-=======
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define appName "pyo"
-#define pyVer "2.6"
-#define appVer "0.7.6"
-
-[Setup]
-; 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.)
-AppId={{AC79C5C4-BE36-419E-B94A-98C6D0DCF4B9}
->>>>>>> upstream/0.7.6
AppName={#appName}
AppVersion={#appVer}
AppPublisher=iACT.umontreal.ca
@@ -36,16 +21,15 @@ DisableDirPage=no
AlwaysShowDirOnReadyPage=yes
DefaultGroupName={#appName}
AllowNoIcons=yes
-<<<<<<< HEAD
-InfoBeforeFile=C:\Users\olipet\svn\pyo\installers\win\\README-win32-py26.txt
-LicenseFile=C:\Users\olipet\svn\pyo\COPYING.txt
+InfoBeforeFile=C:\Users\olivier\svn\pyo\installers\win\\README-win32-py26.txt
+LicenseFile=C:\Users\olivier\svn\pyo\COPYING.txt
OutputBaseFilename={#appName}_{#appVer}_py{#pyVer}_setup
Compression=lzma
SolidCompression=yes
ChangesAssociations=yes
ChangesEnvironment=yes
DirExistsWarning=no
-SetupIconFile=C:\Users\olipet\svn\pyo\utils\E-PyoIcon.ico
+SetupIconFile=C:\Users\olivier\svn\pyo\utils\E-PyoIcon.ico
[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -67,13 +51,13 @@ 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
-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
+Source: "C:\Users\olivier\svn\pyo\examples\*"; DestDir: "{userdesktop}\pyo_examples\"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\olivier\svn\pyo\installers\win\README-win32-py26.txt"; DestDir: "{userdesktop}"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
; E-Pyo stuff
-Source: "C:\Users\olipet\svn\pyo\utils\E-Pyo_py26\E-Pyo.exe"; DestDir: "{pf}\E-Pyo"; Flags: ignoreversion
-Source: "C:\Users\olipet\svn\pyo\utils\E-Pyo_py26\Resources\*"; DestDir: "{pf}\E-Pyo\Resources"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\olivier\svn\pyo\utils\E-Pyo_py26\E-Pyo.exe"; DestDir: "{pf}\E-Pyo"; Flags: ignoreversion
+Source: "C:\Users\olivier\svn\pyo\utils\E-Pyo_py26\Resources\*"; DestDir: "{pf}\E-Pyo\Resources"; Flags: ignoreversion recursesubdirs createallsubdirs
[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
@@ -113,84 +97,6 @@ begin
Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
end;
-=======
-InfoBeforeFile=C:\Users\olivier\svn\pyo\installers\win\\README-win32-py26.txt
-LicenseFile=C:\Users\olivier\svn\pyo\COPYING.txt
-OutputBaseFilename={#appName}_{#appVer}_py{#pyVer}_setup
-Compression=lzma
-SolidCompression=yes
-ChangesAssociations=yes
-ChangesEnvironment=yes
-DirExistsWarning=no
-SetupIconFile=C:\Users\olivier\svn\pyo\utils\E-PyoIcon.ico
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-; should use PYTHONPATH variable
-[Files]
-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
-Source: "C:\Python26\Lib\site-packages\_pyo.pyd"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\_pyo64.pyd"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\libsndfile-1.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\lo.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\portaudio.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\portmidi.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\porttime.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\pthreadVC2.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python26\Lib\site-packages\msvcr90.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-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
-Source: "C:\Users\olivier\svn\pyo\examples\*"; DestDir: "{userdesktop}\pyo_examples\"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\olivier\svn\pyo\installers\win\README-win32-py26.txt"; DestDir: "{userdesktop}"; Flags: ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-; E-Pyo stuff
-Source: "C:\Users\olivier\svn\pyo\utils\E-Pyo_py26\E-Pyo.exe"; DestDir: "{pf}\E-Pyo"; Flags: ignoreversion
-Source: "C:\Users\olivier\svn\pyo\utils\E-Pyo_py26\Resources\*"; DestDir: "{pf}\E-Pyo\Resources"; Flags: ignoreversion recursesubdirs createallsubdirs
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
-
-[Icons]
-Name: "{group}\E-Pyo"; Filename: "{pf}\E-Pyo\E-Pyo.exe"; WorkingDir: "{pf}\E-Pyo"
-Name: "{commondesktop}\E-Pyo"; Filename: "{pf}\E-Pyo\E-Pyo.exe"; Tasks: desktopicon
-
-[Run]
-Filename: "{pf}\E-Pyo\E-Pyo.exe"; Description: "{cm:LaunchProgram,E-Pyo}"; Flags: nowait postinstall skipifsilent
-
-[InstallDelete]
-Type: filesandordirs; Name: "{userdesktop}\pyo_examples";
-Type: filesandordirs; Name: "{userdocs}\.epyo";
-;;;;;;;;;;;;;
-
-[Registry]
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "C:\Python26;{olddata}"; Check: NeedsAddPath('{app}')
-
-[Code]
-procedure ExitProcess(exitCode:integer);
- external 'ExitProcess at kernel32.dll stdcall';
-
-function NeedsAddPath(Param: string): boolean;
-var
- OrigPath: string;
-begin
- if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
- 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment',
- 'Path', OrigPath)
- then begin
- Result := True;
- exit;
- end;
- // look for the path with leading and trailing semicolon
- // Pos() returns 0 if not found
- Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
-end;
-
->>>>>>> upstream/0.7.6
function GetDirName(Value: string): string;
var
InstallPath: string;
@@ -222,12 +128,6 @@ begin
BEGIN
Result := 'C:\Python26';
END
-<<<<<<< HEAD
end;
-=======
-end;
-
-
->>>>>>> upstream/0.7.6
diff --git a/installers/win/win_installer_py27.iss b/installers/win/win_installer_py27.iss
index 10c214c..e90ddda 100644
--- a/installers/win/win_installer_py27.iss
+++ b/installers/win/win_installer_py27.iss
@@ -1,10 +1,9 @@
-<<<<<<< HEAD
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define appName "pyo"
#define pyVer "2.7"
-#define appVer "0.7.5"
+#define appVer "0.7.6"
[Setup]
; NOTE: The value of AppId uniquely identifies this application.
@@ -22,15 +21,15 @@ DisableDirPage=no
AlwaysShowDirOnReadyPage=yes
DefaultGroupName={#appName}
AllowNoIcons=yes
-InfoBeforeFile=C:\Users\olipet\svn\pyo\installers\win\\README-win32-py27.txt
-LicenseFile=C:\Users\olipet\svn\pyo\COPYING.txt
+InfoBeforeFile=C:\Users\olivier\svn\pyo\installers\win\\README-win32-py27.txt
+LicenseFile=C:\Users\olivier\svn\pyo\COPYING.txt
OutputBaseFilename={#appName}_{#appVer}_py{#pyVer}_setup
Compression=lzma
SolidCompression=yes
ChangesAssociations=yes
ChangesEnvironment=yes
DirExistsWarning=no
-SetupIconFile=C:\Users\olipet\svn\pyo\utils\E-PyoIcon.ico
+SetupIconFile=C:\Users\olivier\svn\pyo\utils\E-PyoIcon.ico
[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -51,12 +50,12 @@ Source: "C:\Python27\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:\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
+Source: "C:\Users\olivier\svn\pyo\examples\*"; DestDir: "{userdesktop}\pyo_examples\"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
; E-Pyo stuff
-Source: "C:\Users\olipet\svn\pyo\utils\E-Pyo_py27\E-Pyo.exe"; DestDir: "{pf}\E-Pyo"; Flags: ignoreversion
-Source: "C:\Users\olipet\svn\pyo\utils\E-Pyo_py27\Resources\*"; DestDir: "{pf}\E-Pyo\Resources"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\olivier\svn\pyo\utils\E-Pyo_py27\E-Pyo.exe"; DestDir: "{pf}\E-Pyo"; Flags: ignoreversion
+Source: "C:\Users\olivier\svn\pyo\utils\E-Pyo_py27\Resources\*"; DestDir: "{pf}\E-Pyo\Resources"; Flags: ignoreversion recursesubdirs createallsubdirs
[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
@@ -95,104 +94,6 @@ begin
// Pos() returns 0 if not found
Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
end;
-=======
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define appName "pyo"
-#define pyVer "2.7"
-#define appVer "0.7.6"
-
-[Setup]
-; 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.)
-AppId={{59447873-F994-4BC7-8B1D-0DDCA5B6AFFD}
-AppName={#appName}
-AppVersion={#appVer}
-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={code:GetDirName}
-DisableDirPage=no
-AlwaysShowDirOnReadyPage=yes
-DefaultGroupName={#appName}
-AllowNoIcons=yes
-InfoBeforeFile=C:\Users\olivier\svn\pyo\installers\win\\README-win32-py27.txt
-LicenseFile=C:\Users\olivier\svn\pyo\COPYING.txt
-OutputBaseFilename={#appName}_{#appVer}_py{#pyVer}_setup
-Compression=lzma
-SolidCompression=yes
-ChangesAssociations=yes
-ChangesEnvironment=yes
-DirExistsWarning=no
-SetupIconFile=C:\Users\olivier\svn\pyo\utils\E-PyoIcon.ico
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Files]
-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
-Source: "C:\Python27\Lib\site-packages\_pyo.pyd"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\_pyo64.pyd"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\libsndfile-1.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\lo.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\portaudio.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\portmidi.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\porttime.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\pthreadVC2.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Python27\Lib\site-packages\msvcr90.dll"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-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:\Python27\Lib\site-packages\pyo-{#appVer}-py{#pyVer}.egg-info"; DestDir: "{app}\Lib\site-packages"; Flags: ignoreversion
-Source: "C:\Users\olivier\svn\pyo\examples\*"; DestDir: "{userdesktop}\pyo_examples\"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-; E-Pyo stuff
-Source: "C:\Users\olivier\svn\pyo\utils\E-Pyo_py27\E-Pyo.exe"; DestDir: "{pf}\E-Pyo"; Flags: ignoreversion
-Source: "C:\Users\olivier\svn\pyo\utils\E-Pyo_py27\Resources\*"; DestDir: "{pf}\E-Pyo\Resources"; Flags: ignoreversion recursesubdirs createallsubdirs
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
-
-[Icons]
-Name: "{group}\E-Pyo"; Filename: "{pf}\E-Pyo\E-Pyo.exe"; WorkingDir: "{pf}\E-Pyo"
-Name: "{commondesktop}\E-Pyo"; Filename: "{pf}\E-Pyo\E-Pyo.exe"; Tasks: desktopicon
-
-[Run]
-Filename: "{pf}\E-Pyo\E-Pyo.exe"; Description: "{cm:LaunchProgram,E-Pyo}"; Flags: nowait postinstall skipifsilent
-
-[InstallDelete]
-Type: filesandordirs; Name: "{userdesktop}\pyo_examples";
-Type: filesandordirs; Name: "{userdocs}\.epyo";
-;;;;;;;;;;;;;
-
-[Registry]
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{app};{olddata}"; Check: NeedsAddPath('{app}')
-
-[Code]
-procedure ExitProcess(exitCode:integer);
- external 'ExitProcess at kernel32.dll stdcall';
-
-function NeedsAddPath(Param: string): boolean;
-var
- OrigPath: string;
-begin
- if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
- 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment',
- 'Path', OrigPath)
- then begin
- Result := True;
- exit;
- end;
- // look for the path with leading and trailing semicolon
- // Pos() returns 0 if not found
- Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
-end;
->>>>>>> upstream/0.7.6
function GetDirName(Value: string): string;
var
diff --git a/pyo.py b/pyo.py
index 48131ba..8c2eb72 100644
--- a/pyo.py
+++ b/pyo.py
@@ -97,11 +97,7 @@ OBJECTS_TREE = {'functions': sorted(['pa_count_devices', 'pa_get_default_input',
'BrownNoise', 'Rossler', 'Lorenz', 'LFO', 'SumOsc', 'SuperSaw', 'RCOsc']),
'internals': sorted(['Dummy', 'InputFader', 'Mix', 'VarPort']),
'midi': sorted(['Midictl', 'CtlScan', 'CtlScan2', 'Notein', 'MidiAdsr', 'MidiDelAdsr', 'Bendin',
-<<<<<<< HEAD
- 'Touchin', 'Programin']),
-=======
'Touchin', 'Programin', 'RawMidi']),
->>>>>>> upstream/0.7.6
'opensndctrl': sorted(['OscReceive', 'OscSend', 'OscDataSend', 'OscDataReceive', 'OscListReceive']),
'pan': sorted(['Pan', 'SPan', 'Switch', 'Selector', 'Mixer', 'VoiceManager']),
'pattern': sorted(['Pattern', 'Score', 'CallAfter']),
diff --git a/pyolib/_core.py b/pyolib/_core.py
index cb42326..5549858 100644
--- a/pyolib/_core.py
+++ b/pyolib/_core.py
@@ -18,11 +18,7 @@ GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with pyo. If not, see <http://www.gnu.org/licenses/>.
"""
-<<<<<<< HEAD
-from types import ListType, TupleType, SliceType, FloatType, StringType, UnicodeType, NoneType
-=======
from types import BooleanType, ListType, TupleType, SliceType, LongType, IntType, FloatType, StringType, UnicodeType, NoneType
->>>>>>> upstream/0.7.6
import random, os, sys, inspect, tempfile
from subprocess import call
from weakref import proxy
@@ -390,19 +386,6 @@ class WeakMethod(object):
else:
self.method = callobj
self.isMethod = False
-<<<<<<< HEAD
-
- def __call__(self, *args, **kwargs):
- """Call the method with args and kwargs as needed."""
- if self.isMethod:
- return self.method(self.target, *args, **kwargs)
- else:
- return self.method(*args, **kwargs)
-
-class PyoError(Exception):
- """Base class for all pyo exceptions."""
-=======
->>>>>>> upstream/0.7.6
def __call__(self, *args, **kwargs):
"""Call the method with args and kwargs as needed."""
@@ -469,7 +452,6 @@ class PyoObjectBase(object):
return self._base_objs
def getServer(self):
-<<<<<<< HEAD
"""
Return a reference to the current Server object.
@@ -479,22 +461,8 @@ class PyoObjectBase(object):
def getSamplingRate(self):
"""
Return the current sampling rate (samples per second), as a float.
-=======
- """
- Return a reference to the current Server object.
-
- """
- return self._base_objs[0].getServer()
->>>>>>> upstream/0.7.6
-
- def getSamplingRate(self):
- """
-<<<<<<< HEAD
-=======
- Return the current sampling rate (samples per second), as a float.
"""
->>>>>>> upstream/0.7.6
return self._base_objs[0].getServer().getSamplingRate()
def getBufferSize(self):
@@ -1489,10 +1457,7 @@ class PyoTableObject(PyoObjectBase):
value(s) to add.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "T", x)
->>>>>>> upstream/0.7.6
if type(x) == ListType:
if type(x[0]) == ListType:
[obj.add(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1517,10 +1482,7 @@ class PyoTableObject(PyoObjectBase):
value(s) to substract.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "T", x)
->>>>>>> upstream/0.7.6
if type(x) == ListType:
if type(x[0]) == ListType:
[obj.sub(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1545,10 +1507,7 @@ class PyoTableObject(PyoObjectBase):
value(s) to multiply.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "T", x)
->>>>>>> upstream/0.7.6
if type(x) == ListType:
if type(x[0]) == ListType:
[obj.mul(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1597,10 +1556,7 @@ class PyoTableObject(PyoObjectBase):
the server GUI before showing the controller window.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "SB", title, wxnoserver)
->>>>>>> upstream/0.7.6
samples = self._base_objs[0].getViewTable((500,200))
createViewTableWindow(samples, title, wxnoserver, self.__class__.__name__, self)
@@ -1794,10 +1750,7 @@ class PyoMatrixObject(PyoObjectBase):
the server GUI before showing the controller window.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "SB", title, wxnoserver)
->>>>>>> upstream/0.7.6
samples = self._base_objs[0].getViewData()
createViewMatrixWindow(samples, self.getSize(), title, wxnoserver, self)
@@ -2281,10 +2234,7 @@ class VarPort(PyoObject):
new `function` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "c", x)
->>>>>>> upstream/0.7.6
self._function = getWeakMethodRef(x)
x, lmax = convertArgsToLists(x)
[obj.setFunction(WeakMethod(wrap(x,i))) for i, obj in enumerate(self._base_objs)]
@@ -2534,11 +2484,7 @@ class Compare(PyoObject):
pyoArgsAssert(self, "oOsOO", input, comp, mode, mul, add)
PyoObject.__init__(self, mul, add)
self._input = input
- if type(comp) in [StringType, UnicodeType, NoneType]:
- print 'TypeError: "comp" argument of %s must be a float or a PyoObject. Set to 0.\n' % self.__class__.__name__
- comp = self._comp = 0
- else:
- self._comp = comp
+ self._comp = comp
self._mode = mode
self._in_fader = InputFader(input)
self.comp_dict = {"<": 0, "<=": 1, ">": 2, ">=": 3, "==": 4, "!=": 5}
@@ -2574,13 +2520,7 @@ class Compare(PyoObject):
New comparison signal.
"""
-<<<<<<< HEAD
- if type(x) in [StringType, UnicodeType, NoneType]:
- print >> sys.stderr, 'TypeError: "comp" argument of %s must be a float or a PyoObject.\n' % self.__class__.__name__
- return
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._comp = x
x, lmax = convertArgsToLists(x)
[obj.setComp(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
diff --git a/pyolib/_wxwidgets.py b/pyolib/_wxwidgets.py
index 491b0ee..137eb23 100644
--- a/pyolib/_wxwidgets.py
+++ b/pyolib/_wxwidgets.py
@@ -1576,11 +1576,7 @@ class ScopeDisplay(wx.Frame):
self.toolBox.Add(self.activeTog, 0, wx.TOP|wx.LEFT|wx.RIGHT, 5)
self.toolBox.AddSpacer(10)
self.toolBox.Add(wx.StaticText(self.panel, -1, label="Window length (ms):"), 0, wx.TOP, 11)
-<<<<<<< HEAD
- self.lenSlider = ControlSlider(self.panel, 10, 60, length * 1000, outFunction=self.setLength)
-=======
self.lenSlider = ControlSlider(self.panel, 10, 1000, length * 1000, log=True, outFunction=self.setLength)
->>>>>>> upstream/0.7.6
self.toolBox.Add(self.lenSlider, 1, wx.TOP|wx.LEFT|wx.RIGHT, 11)
self.toolBox.AddSpacer(40)
self.mainBox.Add(self.toolBox, 0, wx.EXPAND)
@@ -1588,15 +1584,9 @@ class ScopeDisplay(wx.Frame):
self.box = wx.BoxSizer(wx.VERTICAL)
self.scopePanel = ScopePanel(self.panel, self.obj)
self.box.Add(self.scopePanel, 1, wx.EXPAND|wx.LEFT|wx.RIGHT, 5)
-<<<<<<< HEAD
- self.dispBox.Add(self.box, 1, wx.EXPAND, 0)
- self.gainSlider = ControlSlider(self.panel, -24, 24, 20.0 * math.log10(gain), outFunction=self.setGain, orient=wx.VERTICAL)
- self.dispBox.Add(self.gainSlider, 0, wx.EXPAND)
-=======
self.dispBox.Add(self.box, 1, wx.EXPAND|wx.BOTTOM, 5)
self.gainSlider = ControlSlider(self.panel, -24, 24, 20.0 * math.log10(gain), outFunction=self.setGain, orient=wx.VERTICAL)
self.dispBox.Add(self.gainSlider, 0, wx.EXPAND|wx.BOTTOM, 5)
->>>>>>> upstream/0.7.6
self.dispBox.AddSpacer(5)
self.mainBox.Add(self.dispBox, 1, wx.EXPAND)
self.panel.SetSizer(self.mainBox)
@@ -1651,10 +1641,6 @@ class ScopePanel(wx.Panel):
def setGain(self, gain):
self.gain = gain
-<<<<<<< HEAD
- print self.gain
-=======
->>>>>>> upstream/0.7.6
def setLength(self, length):
self.length = length
diff --git a/pyolib/analysis.py b/pyolib/analysis.py
index bb2b93b..81f1db6 100644
--- a/pyolib/analysis.py
+++ b/pyolib/analysis.py
@@ -542,10 +542,7 @@ class Centroid(PyoObject):
"""
def __init__(self, input, size=1024, mul=1, add=0):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oiOO", input, size, mul, add)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self, mul, add)
self._input = input
self._size = size
@@ -565,10 +562,7 @@ class Centroid(PyoObject):
Crossfade time between old and new input. Default to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
@@ -590,11 +584,7 @@ class AttackDetector(PyoObject):
"""
Audio signal onset detection.
-<<<<<<< HEAD
- AttackDetector anaylises an audio signal in input an output a trigger each
-=======
AttackDetector analyses an audio signal in input and output a trigger each
->>>>>>> upstream/0.7.6
time an onset is detected. An onset is a sharp amplitude rising while the
signal had previously fall below a minimum threshold. Parameters must be
carefully tuned depending on the nature of the analysed signal and the level
@@ -633,10 +623,7 @@ class AttackDetector(PyoObject):
"""
def __init__(self, input, deltime=0.005, cutoff=10, maxthresh=3, minthresh=-30, reltime=0.1, mul=1, add=0):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "onnnnnOO", input, deltime, cutoff, maxthresh, minthresh, reltime, mul, add)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self, mul, add)
self._input = input
self._deltime = deltime
@@ -660,10 +647,7 @@ class AttackDetector(PyoObject):
Crossfade time between old and new input. Default to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
@@ -677,10 +661,7 @@ class AttackDetector(PyoObject):
New delay between rms analysis.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._deltime = x
x, lmax = convertArgsToLists(x)
[obj.setDeltime(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -695,10 +676,7 @@ class AttackDetector(PyoObject):
New cutoff for the follower lowpass filter.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._cutoff = x
x, lmax = convertArgsToLists(x)
[obj.setCutoff(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -713,10 +691,7 @@ class AttackDetector(PyoObject):
New attack threshold in dB.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._maxthresh = x
x, lmax = convertArgsToLists(x)
[obj.setMaxthresh(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -731,10 +706,7 @@ class AttackDetector(PyoObject):
New minimum threshold in dB.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._minthresh = x
x, lmax = convertArgsToLists(x)
[obj.setMinthresh(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -749,10 +721,7 @@ class AttackDetector(PyoObject):
Time, in seconds, to wait before reporting a new attack.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._reltime = x
x, lmax = convertArgsToLists(x)
[obj.setReltime(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -859,10 +828,7 @@ class Spectrum(PyoObject):
"""
def __init__(self, input, size=1024, wintype=2, function=None):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oiiC", input, size, wintype, function)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self)
self.points = None
self.viewFrame = None
@@ -896,10 +862,7 @@ class Spectrum(PyoObject):
Crossfade time between old and new input. Default to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
@@ -913,10 +876,7 @@ class Spectrum(PyoObject):
new `size` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "i", x)
->>>>>>> upstream/0.7.6
self._size = x
x, lmax = convertArgsToLists(x)
[obj.setSize(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -931,10 +891,7 @@ class Spectrum(PyoObject):
new `wintype` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "i", x)
->>>>>>> upstream/0.7.6
self._wintype = x
x, lmax = convertArgsToLists(x)
[obj.setWinType(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -951,10 +908,7 @@ class Spectrum(PyoObject):
and will receive the data as a list of lists (one list per channel).
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "C", function)
->>>>>>> upstream/0.7.6
self._function = getWeakMethodRef(function)
def poll(self, active):
@@ -968,10 +922,7 @@ class Spectrum(PyoObject):
defaults to True.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "B", active)
->>>>>>> upstream/0.7.6
if active:
self._timer.play()
else:
@@ -988,10 +939,7 @@ class Spectrum(PyoObject):
retrieve the current analysis frame. defaults to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "N", time)
->>>>>>> upstream/0.7.6
self._timer.time = time
def setLowbound(self, x):
@@ -1006,10 +954,7 @@ class Spectrum(PyoObject):
new `lowbound` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._lowbound = x
x, lmax = convertArgsToLists(x)
tmp = [obj.setLowbound(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1027,10 +972,7 @@ class Spectrum(PyoObject):
new `highbound` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._highbound = x
x, lmax = convertArgsToLists(x)
tmp = [obj.setHighbound(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1063,10 +1005,7 @@ class Spectrum(PyoObject):
new `width` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "i", x)
->>>>>>> upstream/0.7.6
self._width = x
x, lmax = convertArgsToLists(x)
[obj.setWidth(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1083,10 +1022,7 @@ class Spectrum(PyoObject):
new `height` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "i", x)
->>>>>>> upstream/0.7.6
self._height = x
x, lmax = convertArgsToLists(x)
[obj.setHeight(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1102,10 +1038,7 @@ class Spectrum(PyoObject):
it back to linear. Defaults to False.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "b", x)
->>>>>>> upstream/0.7.6
self._fscaling = x
x, lmax = convertArgsToLists(x)
[obj.setFscaling(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1123,10 +1056,7 @@ class Spectrum(PyoObject):
False turns it back to linear. Defaults to True.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "b", x)
->>>>>>> upstream/0.7.6
self._mscaling = x
x, lmax = convertArgsToLists(x)
[obj.setMscaling(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1161,10 +1091,7 @@ class Spectrum(PyoObject):
new `gain` attribute, as linear values.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._gain = x
x, lmax = convertArgsToLists(x)
[obj.setGain(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1185,10 +1112,7 @@ class Spectrum(PyoObject):
the server GUI before showing the controller window.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "SB", title, wxnoserver)
->>>>>>> upstream/0.7.6
createSpectrumWindow(self, title, wxnoserver)
def _setViewFrame(self, frame):
@@ -1312,10 +1236,7 @@ class Scope(PyoObject):
"""
def __init__(self, input, length=0.05, gain=0.67):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oNN", input, length, gain)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self)
self.points = None
self.viewFrame = None
@@ -1342,10 +1263,7 @@ class Scope(PyoObject):
Crossfade time between old and new input. Default to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
@@ -1359,10 +1277,7 @@ class Scope(PyoObject):
new `length` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "N", x)
->>>>>>> upstream/0.7.6
self._length = x
self._timer.time = x
[obj.setLength(x) for obj in self._base_objs]
@@ -1377,10 +1292,7 @@ class Scope(PyoObject):
new `gain` attribute, as linear values.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._gain = x
x, lmax = convertArgsToLists(x)
[obj.setGain(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1396,10 +1308,7 @@ class Scope(PyoObject):
defaults to True.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "B", active)
->>>>>>> upstream/0.7.6
if active:
self._timer.play()
else:
@@ -1419,10 +1328,7 @@ class Scope(PyoObject):
width is 500.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "I", x)
->>>>>>> upstream/0.7.6
self._width = x
[obj.setWidth(x) for obj in self._base_objs]
@@ -1440,10 +1346,7 @@ class Scope(PyoObject):
height is 400.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "I", x)
->>>>>>> upstream/0.7.6
self._height = x
[obj.setHeight(x) for obj in self._base_objs]
@@ -1463,10 +1366,7 @@ class Scope(PyoObject):
the server GUI before showing the controller window.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "SB", title, wxnoserver)
->>>>>>> upstream/0.7.6
createScopeWindow(self, title, wxnoserver)
def _setViewFrame(self, frame):
@@ -1541,10 +1441,7 @@ class PeakAmp(PyoObject):
"""
def __init__(self, input, function=None, mul=1, add=0):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oCOO", input, function, mul, add)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self, mul, add)
self._input = input
if callable(function):
@@ -1556,11 +1453,7 @@ class PeakAmp(PyoObject):
self._base_objs = [PeakAmp_base(wrap(in_fader,i), wrap(mul,i), wrap(add,i)) for i in range(lmax)]
sr = self.getSamplingRate()
bs = self.getBufferSize()
-<<<<<<< HEAD
- self._timer = Pattern(self._buildList, bs/sr).play()
-=======
self._timer = Pattern(self._buildList, 0.06).play()
->>>>>>> upstream/0.7.6
def setInput(self, x, fadetime=0.05):
"""
@@ -1574,10 +1467,7 @@ class PeakAmp(PyoObject):
Crossfade time between old and new input. Default to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
@@ -1591,11 +1481,6 @@ class PeakAmp(PyoObject):
New function to call with amplitude values in arguments.
"""
-<<<<<<< HEAD
- if callable(x):
- self._function = getWeakMethodRef(x)
-
-=======
pyoArgsAssert(self, "C", x)
if callable(x):
self._function = getWeakMethodRef(x)
@@ -1613,7 +1498,6 @@ class PeakAmp(PyoObject):
pyoArgsAssert(self, "N", x)
self._timer.time = x
->>>>>>> upstream/0.7.6
def out(self, chnl=0, inc=1, dur=0, delay=0):
return self.play(dur, delay)
diff --git a/pyolib/arithmetic.py b/pyolib/arithmetic.py
index 3895dda..f1a476b 100644
--- a/pyolib/arithmetic.py
+++ b/pyolib/arithmetic.py
@@ -721,10 +721,7 @@ class Tanh(PyoObject):
"""
def __init__(self, input, mul=1, add=0):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oOO", input, mul, add)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self, mul, add)
self._input = input
self._in_fader = InputFader(input)
@@ -743,10 +740,7 @@ class Tanh(PyoObject):
Crossfade time between old and new input. Default to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
diff --git a/pyolib/dynamics.py b/pyolib/dynamics.py
index 2fa10a6..5867977 100644
--- a/pyolib/dynamics.py
+++ b/pyolib/dynamics.py
@@ -1028,4 +1028,4 @@ class Max(PyoObject):
"""float or PyoObject. Comparison value."""
return self._comp
@comp.setter
- def comp(self, x): self.setComp(x)
\ No newline at end of file
+ def comp(self, x): self.setComp(x)
diff --git a/pyolib/effects.py b/pyolib/effects.py
index 1a6ba56..0e4e915 100644
--- a/pyolib/effects.py
+++ b/pyolib/effects.py
@@ -855,11 +855,7 @@ class WGVerb(PyoObject):
"""
8 delay lines mono FDN reverb.
-<<<<<<< HEAD
- 8 delay line FDN reverb, with feedback matrix based upon physical
-=======
8 delay lines FDN reverb, with feedback matrix based upon physical
->>>>>>> upstream/0.7.6
modeling scattering junction of 8 lossless waveguides of equal
characteristic impedance.
@@ -1584,10 +1580,7 @@ class SmoothDelay(PyoObject):
"""
def __init__(self, input, delay=0.25, feedback=0, crossfade=0.05, maxdelay=1, mul=1, add=0):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oOOnnOO", input, delay, feedback, crossfade, maxdelay, mul, add)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self, mul, add)
self._input = input
self._delay = delay
@@ -1610,10 +1603,7 @@ class SmoothDelay(PyoObject):
Crossfade time between old and new input. Defaults to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
@@ -1627,10 +1617,7 @@ class SmoothDelay(PyoObject):
New `delay` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._delay = x
x, lmax = convertArgsToLists(x)
[obj.setDelay(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1645,10 +1632,7 @@ class SmoothDelay(PyoObject):
New `feedback` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._feedback = x
x, lmax = convertArgsToLists(x)
[obj.setFeedback(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1663,10 +1647,7 @@ class SmoothDelay(PyoObject):
New `crossfade` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._crossfade = x
x, lmax = convertArgsToLists(x)
[obj.setCrossfade(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1742,10 +1723,7 @@ class FreqShift(PyoObject):
"""
def __init__(self, input, shift=100, mul=1, add=0):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oOOO", input, shift, mul, add)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self, mul, add)
self._input = input
self._shift = shift
@@ -1800,10 +1778,7 @@ class FreqShift(PyoObject):
Crossfade time between old and new input. Defaults to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
@@ -1817,10 +1792,7 @@ class FreqShift(PyoObject):
New `shift` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._shift = x
x, lmax = convertArgsToLists(x)
[obj.setFreq(wrap(x,i)) for i, obj in enumerate(self._sin_objs)]
diff --git a/pyolib/generators.py b/pyolib/generators.py
index aa59fd3..db2fa97 100644
--- a/pyolib/generators.py
+++ b/pyolib/generators.py
@@ -1054,10 +1054,7 @@ class LFO(PyoObject):
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "i", x)
->>>>>>> upstream/0.7.6
self._type = x
x, lmax = convertArgsToLists(x)
[obj.setType(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
diff --git a/pyolib/midi.py b/pyolib/midi.py
index 9b8c0da..588fc88 100644
--- a/pyolib/midi.py
+++ b/pyolib/midi.py
@@ -243,12 +243,6 @@ class CtlScan(PyoObject):
def __init__(self, function, toprint=True):
pyoArgsAssert(self, "CB", function, toprint)
PyoObject.__init__(self)
-<<<<<<< HEAD
- if not callable(function):
- print >> sys.stderr, 'TypeError: "function" argument of %s must be callable.\n' % self.__class__.__name__
- exit()
-=======
->>>>>>> upstream/0.7.6
self._function = WeakMethod(function)
self._toprint = toprint
self._base_objs = [CtlScan_base(self._function, self._toprint)]
@@ -285,10 +279,7 @@ class CtlScan(PyoObject):
new `function` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "C", x)
->>>>>>> upstream/0.7.6
self._function = WeakMethod(x)
[obj.setFunction(self._function) for i, obj in enumerate(self._base_objs)]
@@ -363,12 +354,6 @@ class CtlScan2(PyoObject):
def __init__(self, function, toprint=True):
pyoArgsAssert(self, "CB", function, toprint)
PyoObject.__init__(self)
-<<<<<<< HEAD
- if not callable(function):
- print >> sys.stderr, 'TypeError: "function" argument of %s must be callable.\n' % self.__class__.__name__
- exit()
-=======
->>>>>>> upstream/0.7.6
self._function = WeakMethod(function)
self._toprint = toprint
self._base_objs = [CtlScan2_base(self._function, self._toprint)]
@@ -405,10 +390,7 @@ class CtlScan2(PyoObject):
new `function` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "C", x)
->>>>>>> upstream/0.7.6
self._function = WeakMethod(x)
[obj.setFunction(self._function) for i, obj in enumerate(self._base_objs)]
@@ -1270,9 +1252,6 @@ class MidiDelAdsr(PyoObject):
"""float. Duration of the release phase in seconds."""
return self._release
@release.setter
-<<<<<<< HEAD
- def release(self, x): self.setRelease(x)
-=======
def release(self, x): self.setRelease(x)
class RawMidi(PyoObject):
@@ -1350,4 +1329,3 @@ class RawMidi(PyoObject):
@function.setter
def function(self, x):
self.setFunction(x)
->>>>>>> upstream/0.7.6
diff --git a/pyolib/opensndctrl.py b/pyolib/opensndctrl.py
index c856def..163cd94 100644
--- a/pyolib/opensndctrl.py
+++ b/pyolib/opensndctrl.py
@@ -313,13 +313,6 @@ class OscDataSend(PyoObject):
types : str
String specifying the types sequence of the message to be sent.
Possible values are:
-<<<<<<< HEAD
- - integer : "i"
- - long integer : "h"
- - float : "f"
- - double : "d"
- - string : "s"
-=======
- "i" : integer
- "h" : long integer
- "f" : float
@@ -331,7 +324,6 @@ class OscDataSend(PyoObject):
- "T" : True
- "F" : False
- "N" : None (nil)
->>>>>>> upstream/0.7.6
The string "ssfi" indicates that the value to send will be a list
containing two strings followed by a float and an integer.
@@ -372,10 +364,7 @@ class OscDataSend(PyoObject):
"""
def __init__(self, types, port, address, host="127.0.0.1"):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "siss", types, port, address, host)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self)
types, port, address, host, lmax = convertArgsToLists(types, port, address, host)
self._base_objs = [OscDataSend_base(wrap(types,i), wrap(port,i), wrap(address,i), wrap(host,i)) for i in range(lmax)]
@@ -535,12 +524,6 @@ class OscDataReceive(PyoObject):
pyoArgsAssert(self, "IsC", port, address, function)
PyoObject.__init__(self)
self._port = port
-<<<<<<< HEAD
- if not callable(function):
- print >> sys.stderr, 'TypeError: "function" argument of %s must be callable.\n' % self.__class__.__name__
- exit()
-=======
->>>>>>> upstream/0.7.6
self._function = WeakMethod(function)
self._address, lmax = convertArgsToLists(address)
# self._address is linked with list at C level
diff --git a/pyolib/pattern.py b/pyolib/pattern.py
index a61d8bc..8147c41 100644
--- a/pyolib/pattern.py
+++ b/pyolib/pattern.py
@@ -62,17 +62,6 @@ class Pattern(PyoObject):
def __init__(self, function, time=1):
pyoArgsAssert(self, "cO", function, time)
PyoObject.__init__(self)
-<<<<<<< HEAD
- if type(function) == ListType or type(function) == TupleType:
- if not callable(function[0]):
- print >> sys.stderr, 'TypeError: "function" argument of %s must be callable.\n' % self.__class__.__name__
- exit()
- else:
- if not callable(function):
- print >> sys.stderr, 'TypeError: "function" argument of %s must be callable.\n' % self.__class__.__name__
- exit()
-=======
->>>>>>> upstream/0.7.6
self._function = getWeakMethodRef(function)
self._time = time
function, time, lmax = convertArgsToLists(function, time)
@@ -88,10 +77,7 @@ class Pattern(PyoObject):
new `function` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "c", x)
->>>>>>> upstream/0.7.6
self._function = getWeakMethodRef(x)
x, lmax = convertArgsToLists(x)
[obj.setFunction(WeakMethod(wrap(x,i))) for i, obj in enumerate(self._base_objs)]
@@ -269,17 +255,6 @@ class CallAfter(PyoObject):
def __init__(self, function, time=1, arg=None):
pyoArgsAssert(self, "cn", function, time)
PyoObject.__init__(self)
-<<<<<<< HEAD
- if type(function) == ListType or type(function) == TupleType:
- if not callable(function[0]):
- print >> sys.stderr, 'TypeError: "function" argument of %s must be callable.\n' % self.__class__.__name__
- exit()
- else:
- if not callable(function):
- print >> sys.stderr, 'TypeError: "function" argument of %s must be callable.\n' % self.__class__.__name__
- exit()
-=======
->>>>>>> upstream/0.7.6
self._function = getWeakMethodRef(function)
function, time, arg, lmax = convertArgsToLists(function, time, arg)
self._base_objs = [CallAfter_base(WeakMethod(wrap(function,i)), wrap(time,i), wrap(arg,i)) for i in range(lmax)]
diff --git a/pyolib/tableprocess.py b/pyolib/tableprocess.py
index c60b2ed..88ba328 100644
--- a/pyolib/tableprocess.py
+++ b/pyolib/tableprocess.py
@@ -1603,10 +1603,7 @@ class TableRec(PyoObject):
Crossfade time between old and new input. Defaults to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
@@ -1620,10 +1617,7 @@ class TableRec(PyoObject):
new `table` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "t", x)
->>>>>>> upstream/0.7.6
self._table = x
x, lmax = convertArgsToLists(x)
[obj.setTable(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -1687,10 +1681,7 @@ class TableWrite(PyoObject):
"""
def __init__(self, input, pos, table):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oot", input, pos, table)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self)
self._input = input
self._pos = pos
@@ -1749,10 +1740,7 @@ class TableWrite(PyoObject):
new `pos` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "o", x)
->>>>>>> upstream/0.7.6
self._pos = x
x, lmax = convertArgsToLists(x)
[obj.setPos(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -2855,10 +2843,7 @@ class Granule(PyoObject):
while False means asynchronous.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "b", x)
->>>>>>> upstream/0.7.6
self._sync = x
x, lmax = convertArgsToLists(x)
[obj.setSync(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -3059,10 +3044,7 @@ class Particle(PyoObject):
"""
def __init__(self, table, env, dens=50, pitch=1, pos=0, dur=.1, dev=0.01, pan=0.5, chnls=1, mul=1, add=0):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "ttOOOOOOIOO", table, env, dens, pitch, pos, dur, dev, pan, chnls, mul, add)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self, mul, add)
self._table = table
self._env = env
@@ -3090,10 +3072,7 @@ class Particle(PyoObject):
new `table` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "t", x)
->>>>>>> upstream/0.7.6
self._table = x
x, lmax = convertArgsToLists(x)
[obj.setTable(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3108,10 +3087,7 @@ class Particle(PyoObject):
new `env` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "t", x)
->>>>>>> upstream/0.7.6
self._env = x
x, lmax = convertArgsToLists(x)
[obj.setEnv(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3126,10 +3102,7 @@ class Particle(PyoObject):
new `dens` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._dens = x
x, lmax = convertArgsToLists(x)
[obj.setDens(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3144,10 +3117,7 @@ class Particle(PyoObject):
new `pitch` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._pitch = x
x, lmax = convertArgsToLists(x)
[obj.setPitch(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3162,10 +3132,7 @@ class Particle(PyoObject):
new `pos` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._pos = x
x, lmax = convertArgsToLists(x)
[obj.setPos(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3180,10 +3147,7 @@ class Particle(PyoObject):
new `dur` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._dur = x
x, lmax = convertArgsToLists(x)
[obj.setDur(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3198,10 +3162,7 @@ class Particle(PyoObject):
new `dev` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._dev = x
x, lmax = convertArgsToLists(x)
[obj.setDev(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3216,10 +3177,7 @@ class Particle(PyoObject):
new `pan` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._pan = x
x, lmax = convertArgsToLists(x)
[obj.setPan(wrap(x,i)) for i, obj in enumerate(self._base_players)]
diff --git a/pyolib/tables.py b/pyolib/tables.py
index f68a85b..aeed3c1 100644
--- a/pyolib/tables.py
+++ b/pyolib/tables.py
@@ -69,10 +69,7 @@ class HarmTable(PyoTableObject):
numbers 1,2,3, etc.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "l", list)
->>>>>>> upstream/0.7.6
self._list = list
[obj.replace(list) for obj in self._base_objs]
self.refreshView()
@@ -123,10 +120,7 @@ class SawTable(PyoTableObject):
New number of harmonics
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "I", x)
->>>>>>> upstream/0.7.6
self._order = x
list = [1./i for i in range(1,(self._order+1))]
[obj.replace(list) for obj in self._base_objs]
@@ -183,10 +177,7 @@ class SquareTable(PyoTableObject):
New number of harmonics
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "I", x)
->>>>>>> upstream/0.7.6
self._order = x
list = []
for i in range(1,(self._order*2)):
@@ -250,10 +241,7 @@ class ChebyTable(PyoTableObject):
numbers 1,2,3, ..., 12. Up to 12 partials can be specified.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "l", list)
->>>>>>> upstream/0.7.6
self._list = list
[obj.replace(list) for obj in self._base_objs]
self.refreshView()
@@ -508,10 +496,7 @@ class LinTable(PyoTableObject):
in the table. Location must be integer.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "l", list)
->>>>>>> upstream/0.7.6
self._list = list
[obj.replace(list) for obj in self._base_objs]
self.refreshView()
@@ -644,10 +629,7 @@ class LogTable(PyoTableObject):
in the table. Location must be integer.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "l", list)
->>>>>>> upstream/0.7.6
self._list = list
[obj.replace(list) for obj in self._base_objs]
self.refreshView()
@@ -780,10 +762,7 @@ class CosLogTable(PyoTableObject):
in the table. Location must be integer.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "l", list)
->>>>>>> upstream/0.7.6
self._list = list
[obj.replace(list) for obj in self._base_objs]
self.refreshView()
@@ -915,10 +894,7 @@ class CosTable(PyoTableObject):
in the table. Location must be integer.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "l", list)
->>>>>>> upstream/0.7.6
self._list = list
[obj.replace(list) for obj in self._base_objs]
self.refreshView()
@@ -1103,10 +1079,7 @@ class CurveTable(PyoTableObject):
in the table. Location must be integer.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "l", list)
->>>>>>> upstream/0.7.6
self._list = list
[obj.replace(list) for obj in self._base_objs]
self.refreshView()
@@ -1827,10 +1800,7 @@ class NewTable(PyoTableObject):
the list will be loaded in all tablestreams.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "l", x)
->>>>>>> upstream/0.7.6
if type(x[0]) != ListType:
x = [x]
[obj.setTable(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -2019,10 +1989,7 @@ class DataTable(PyoTableObject):
the list will be loaded in all tablestreams.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "l", x)
->>>>>>> upstream/0.7.6
if type(x[0]) != ListType:
x = [x]
[obj.setTable(wrap(x,i)) for i, obj in enumerate(self._base_objs)]
@@ -2108,10 +2075,7 @@ class AtanTable(PyoTableObject):
"""
def __init__(self, slope=0.5, size=8192):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "NI", slope, size)
->>>>>>> upstream/0.7.6
PyoTableObject.__init__(self, size)
self._slope = slope
self._base_objs = [AtanTable_base(slope, size)]
@@ -2126,10 +2090,7 @@ class AtanTable(PyoTableObject):
New slope between 0 and 1.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "N", x)
->>>>>>> upstream/0.7.6
self._slope = x
[obj.setSlope(x) for obj in self._base_objs]
self.refreshView()
@@ -2189,10 +2150,7 @@ class PartialTable(PyoTableObject):
"""
def __init__(self, list=[(1,1), (1.33,0.5),(1.67,0.3)], size=65536):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "lI", list, size)
->>>>>>> upstream/0.7.6
PyoTableObject.__init__(self, size)
self._list = list
self._par_table = HarmTable(self._create_list(), size)
@@ -2226,10 +2184,7 @@ class PartialTable(PyoTableObject):
and its strength.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "l", list)
->>>>>>> upstream/0.7.6
self._list = list
[obj.replace(self._create_list()) for obj in self._base_objs]
self.normalize()
diff --git a/pyolib/triggers.py b/pyolib/triggers.py
index 33bc577..2e74fa9 100644
--- a/pyolib/triggers.py
+++ b/pyolib/triggers.py
@@ -1175,10 +1175,7 @@ class TrigFunc(PyoObject):
new `function` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "c", x)
->>>>>>> upstream/0.7.6
self._function = getWeakMethodRef(x)
x, lmax = convertArgsToLists(x)
[obj.setFunction(WeakMethod(wrap(x,i))) for i, obj in enumerate(self._base_objs)]
@@ -3271,10 +3268,7 @@ class Euclide(PyoObject):
"""
def __init__(self, time=.125, taps=16, onsets=10, poly=1):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "OiiI", time, taps, onsets, poly)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self)
self._tap_dummy = []
self._amp_dummy = []
@@ -3371,10 +3365,7 @@ class Euclide(PyoObject):
New `time` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._time = x
x, lmax = convertArgsToLists(x)
[obj.setTime(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3389,10 +3380,7 @@ class Euclide(PyoObject):
New `taps` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "i", x)
->>>>>>> upstream/0.7.6
self._taps = x
x, onsets, lmax = convertArgsToLists(x, self._onsets)
for i in range(len(self._base_players)):
@@ -3410,10 +3398,7 @@ class Euclide(PyoObject):
New `onsets` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "i", x)
->>>>>>> upstream/0.7.6
self._onsets = x
x, taps, lmax = convertArgsToLists(x, self._taps)
for i in range(len(self._base_players)):
@@ -3544,10 +3529,7 @@ class TrigBurst(PyoObject):
"""
def __init__(self, input, time=.25, count=10, expand=1.0, ampfade=1.0, poly=1):
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oOinnI", input, time, count, expand, ampfade, poly)
->>>>>>> upstream/0.7.6
PyoObject.__init__(self)
self._tap_dummy = []
self._amp_dummy = []
@@ -3627,10 +3609,7 @@ class TrigBurst(PyoObject):
Crossfade time between old and new input. Defaults to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
@@ -3644,10 +3623,7 @@ class TrigBurst(PyoObject):
New `time` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "O", x)
->>>>>>> upstream/0.7.6
self._time = x
x, lmax = convertArgsToLists(x)
[obj.setTime(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3662,10 +3638,7 @@ class TrigBurst(PyoObject):
New `count` attribute.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "i", x)
->>>>>>> upstream/0.7.6
self._count = x
x, lmax = convertArgsToLists(x)
[obj.setCount(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3676,18 +3649,11 @@ class TrigBurst(PyoObject):
:Args:
-<<<<<<< HEAD
- x : int
- New `expand` attribute.
-
- """
-=======
x : float
New `expand` attribute.
"""
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._expand = x
x, lmax = convertArgsToLists(x)
[obj.setExpand(wrap(x,i)) for i, obj in enumerate(self._base_players)]
@@ -3698,18 +3664,11 @@ class TrigBurst(PyoObject):
:Args:
-<<<<<<< HEAD
- x : int
- New `ampfade` attribute.
-
- """
-=======
x : float
New `ampfade` attribute.
"""
pyoArgsAssert(self, "n", x)
->>>>>>> upstream/0.7.6
self._ampfade = x
x, lmax = convertArgsToLists(x)
[obj.setAmpfade(wrap(x,i)) for i, obj in enumerate(self._base_players)]
diff --git a/pyolib/utils.py b/pyolib/utils.py
index 34108a2..9cfc841 100644
--- a/pyolib/utils.py
+++ b/pyolib/utils.py
@@ -645,10 +645,7 @@ class Record(PyoObject):
Crossfade time between old and new input. Default to 0.05.
"""
-<<<<<<< HEAD
-=======
pyoArgsAssert(self, "oN", x, fadetime)
->>>>>>> upstream/0.7.6
self._input = x
self._in_fader.setInput(x, fadetime)
@@ -1675,64 +1672,6 @@ class FToM(PyoObject):
@property
def input(self):
"""PyoObject. Input signal to process."""
-<<<<<<< HEAD
- return self._input
- @input.setter
- def input(self, x): self.setInput(x)
-
-class FToM(PyoObject):
- """
- Returns the midi note equivalent to a frequency in Hz.
-
- Returns the midi note equivalent to a frequency in Hz,
- 440.0 (hz) = 69.
-
- :Parent: :py:class:`PyoObject`
-
- :Args:
-
- input : PyoObject
- Input signal as frequency in Hz.
-
- >>> s = Server().boot()
- >>> s.start()
- >>> lfo = Sine([0.2,0.25], mul=300, add=600)
- >>> src = SineLoop(freq=lfo, feedback=0.05)
- >>> hz = Yin(src, minfreq=100, maxfreq=1000, cutoff=500)
- >>> mid = FToM(hz)
- >>> fr = Snap(mid, choice=[0,2,5,7,9], scale=1)
- >>> freq = Port(fr, risetime=0.01, falltime=0.01)
- >>> syn = SineLoop(freq, feedback=0.05, mul=0.3).out()
-
- """
-
- def __init__(self, input, mul=1, add=0):
- PyoObject.__init__(self, mul, add)
- self._input = input
- self._in_fader = InputFader(input)
- in_fader, mul, add, lmax = convertArgsToLists(self._in_fader, mul, add)
- self._base_objs = [FToM_base(wrap(in_fader,i), wrap(mul,i), wrap(add,i)) for i in range(lmax)]
-
- def setInput(self, x, fadetime=0.05):
- """
- Replace the `input` attribute.
-
- :Args:
-
- x : PyoObject
- New signal to process.
- fadetime : float, optional
- Crossfade time between old and new input. Default to 0.05.
-
- """
- self._input = x
- self._in_fader.setInput(x, fadetime)
-
- @property
- def input(self):
- """PyoObject. Input signal to process."""
-=======
->>>>>>> upstream/0.7.6
return self._input
@input.setter
def input(self, x): self.setInput(x)
diff --git a/scripts/release_doc_src.sh b/scripts/release_doc_src.sh
index b8adf89..0c9caa2 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.5
-=======
version=0.7.6
->>>>>>> upstream/0.7.6
replace=XXX
doc_rep=pyo_XXX-doc
diff --git a/scripts/win/windows-7-build-routine.txt b/scripts/win/windows-7-build-routine.txt
index ee7fac6..84e74ec 100644
--- a/scripts/win/windows-7-build-routine.txt
+++ b/scripts/win/windows-7-build-routine.txt
@@ -1,31 +1,17 @@
=== STEP 1 ===
-<<<<<<< HEAD
---- Install Python (2.6 and 2.7)
-
-=== STEP 2 ===
-=======
--- Install Python 2.6 and 2.7.10 and WxPython 3.0.2.0 for each version
=== STEP 2 (should be git soon) ===
->>>>>>> upstream/0.7.6
--- Install Slick SVN 1.8.10
http://www.sliksvn.com
=== STEP 3 ===
-<<<<<<< HEAD
---- Install scons 2.3.2 in the Python site-packages:
-http://www.scons.org/download.php
-
-=== STEP 4 ===
---- Install MinGW (minimalist) from sourceforge
-=======
--- Install scons 2.3.5 in the Python site-packages:
http://www.scons.org/download.php
=== STEP 4 ===
--- Install MinGW (minimalist GNU for Windows) from sourceforge
--- Add ";C:\MinGW\bin;C:\MinGW\mingw32\bin" to the PATH variable
->>>>>>> upstream/0.7.6
=== STEP 5 ===
--- Install pthreads (just copy files from ftp):
@@ -40,12 +26,9 @@ Do not build from sources.
=== STEP 7 ===
--- Update liblo tag 0.26 from the tarball at http://liblo.sourceforge.net (not SVN!),
copy build/config-msvc.h --> src/config.h,
-<<<<<<< HEAD
-=======
If there is a conflict about struct timespec, remove the definition in pthread.h.
->>>>>>> upstream/0.7.6
and build with this SConstruct:
# S C O N S T R U C T F O R L I B L O . D L L
@@ -102,11 +85,7 @@ Try the trunk version first, if that doesn't work use the most recent tag.
--- Copy ASIOSDK to portaudio/src/hostapi/asio
--- Check the pa_win_hostapis.c file and make sure that it is configured to build
-<<<<<<< HEAD
-the DirectSound, WMME, and ASIO drivers:
-=======
the DirectSound, WMME, and ASIO drivers. (nothing to do here)
->>>>>>> upstream/0.7.6
--- Need to removed "volatile" from function definitions in MinGW/include/winbase.h
@@ -145,11 +124,7 @@ commonEnvironment.Append(CPPPATH = [".", "src/common", "src/hostapi", "src/os",
"C:/portaudio/src/hostapi/asio/ASIOSDK/host",
"C:/portaudio/src/hostapi/asio/ASIOSDK/host/pc",
"C:/portaudio/src/hostapi/asio/ASIOSDK/common",
-<<<<<<< HEAD
-"C:/Program Files/Microsoft DirectX SDK (April 2007)/Include"])
-=======
"C:/Program Files (x86)/Microsoft DirectX SDK (April 2007)/Include"])
->>>>>>> upstream/0.7.6
commonEnvironment.Append(LIBS=Split('''
setupapi
@@ -204,11 +179,7 @@ portAudio = commonEnvironment.SharedLibrary('portaudio', portAudioSources)
##########################################################################
=== STEP 11 ===
-<<<<<<< HEAD
-4 --- Update the PortMidi library http://portmedia.sourceforge.net from SVN and build it with this SConstruct:
-=======
--- Update the PortMidi library http://portmedia.sourceforge.net from SVN and build it with this SConstruct:
->>>>>>> upstream/0.7.6
'''
MinGW SConstruct for PortMidi
@@ -292,11 +263,6 @@ Depends(test, portmidi)
[build]
compiler = mingw32
-<<<<<<< HEAD
-*** For Python 2.5, comment line 428 to 434 in Python25/include/pyconfig.py
-
-=======
->>>>>>> upstream/0.7.6
=== STEP 13 ===
--- Download pyo sources from svn and build it with:
diff --git a/setup.py b/setup.py
index f9fcdd9..2f2c75f 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.5"
-=======
pyo_version = "0.7.6"
->>>>>>> upstream/0.7.6
build_osx_with_jack_support = False
compile_externals = False
diff --git a/src/engine/pyomodule.c b/src/engine/pyomodule.c
index 3f6199c..88b37e4 100644
--- a/src/engine/pyomodule.c
+++ b/src/engine/pyomodule.c
@@ -2550,10 +2550,7 @@ init_pyo64(void)
module_add_object(m, "MainParticle_base", &MainParticleType);
module_add_object(m, "Particle_base", &ParticleType);
module_add_object(m, "AtanTable_base", &AtanTableType);
-<<<<<<< HEAD
-=======
module_add_object(m, "RawMidi_base", &RawMidiType);
->>>>>>> upstream/0.7.6
PyModule_AddStringConstant(m, "PYO_VERSION", PYO_VERSION);
#ifdef COMPILE_EXTERNALS
diff --git a/src/objects/analysismodule.c b/src/objects/analysismodule.c
index f495c95..1ad618b 100644
--- a/src/objects/analysismodule.c
+++ b/src/objects/analysismodule.c
@@ -1698,14 +1698,10 @@ Centroid_process_i(Centroid *self) {
sum1 += tmp * i;
sum2 += tmp;
}
-<<<<<<< HEAD
- tmp = sum1 / sum2;
-=======
if (sum2 < 0.000000001)
tmp = 0.0;
else
tmp = sum1 / sum2;
->>>>>>> upstream/0.7.6
self->centroid += tmp * self->sr / self->size;
self->centroid *= 0.5;
for (i=0; i<self->hsize; i++) {
diff --git a/src/objects/midimodule.c b/src/objects/midimodule.c
index fa09ec7..0bf5a3d 100644
--- a/src/objects/midimodule.c
+++ b/src/objects/midimodule.c
@@ -2542,264 +2542,6 @@ Notein_new, /* tp_new */
};
/* NoteinTrig trig streamer */
-<<<<<<< HEAD
-typedef struct {
- pyo_audio_HEAD
- MidiNote *handler;
- int modebuffer[2];
- int voice;
- int mode; /* 0 = noteon, 1 = noteoff */
-} NoteinTrig;
-
-static void NoteinTrig_postprocessing_ii(NoteinTrig *self) { POST_PROCESSING_II };
-static void NoteinTrig_postprocessing_ai(NoteinTrig *self) { POST_PROCESSING_AI };
-static void NoteinTrig_postprocessing_ia(NoteinTrig *self) { POST_PROCESSING_IA };
-static void NoteinTrig_postprocessing_aa(NoteinTrig *self) { POST_PROCESSING_AA };
-static void NoteinTrig_postprocessing_ireva(NoteinTrig *self) { POST_PROCESSING_IREVA };
-static void NoteinTrig_postprocessing_areva(NoteinTrig *self) { POST_PROCESSING_AREVA };
-static void NoteinTrig_postprocessing_revai(NoteinTrig *self) { POST_PROCESSING_REVAI };
-static void NoteinTrig_postprocessing_revaa(NoteinTrig *self) { POST_PROCESSING_REVAA };
-static void NoteinTrig_postprocessing_revareva(NoteinTrig *self) { POST_PROCESSING_REVAREVA };
-
-static void
-NoteinTrig_setProcMode(NoteinTrig *self)
-{
- int muladdmode;
- muladdmode = self->modebuffer[0] + self->modebuffer[1] * 10;
-
- switch (muladdmode) {
- case 0:
- self->muladd_func_ptr = NoteinTrig_postprocessing_ii;
- break;
- case 1:
- self->muladd_func_ptr = NoteinTrig_postprocessing_ai;
- break;
- case 2:
- self->muladd_func_ptr = NoteinTrig_postprocessing_revai;
- break;
- case 10:
- self->muladd_func_ptr = NoteinTrig_postprocessing_ia;
- break;
- case 11:
- self->muladd_func_ptr = NoteinTrig_postprocessing_aa;
- break;
- case 12:
- self->muladd_func_ptr = NoteinTrig_postprocessing_revaa;
- break;
- case 20:
- self->muladd_func_ptr = NoteinTrig_postprocessing_ireva;
- break;
- case 21:
- self->muladd_func_ptr = NoteinTrig_postprocessing_areva;
- break;
- case 22:
- self->muladd_func_ptr = NoteinTrig_postprocessing_revareva;
- break;
- }
-}
-
-static void
-NoteinTrig_compute_next_data_frame(NoteinTrig *self)
-{
- int i;
- MYFLT *tmp = MidiNote_get_trigger_buffer(self->handler);
-
- for (i=0; i<self->bufsize; i++) {
- self->data[i] = tmp[self->bufsize*(self->voice*2+self->mode)+i];
- }
- (*self->muladd_func_ptr)(self);
-}
-
-static int
-NoteinTrig_traverse(NoteinTrig *self, visitproc visit, void *arg)
-{
- pyo_VISIT
- Py_VISIT(self->handler);
- return 0;
-}
-
-static int
-NoteinTrig_clear(NoteinTrig *self)
-{
- pyo_CLEAR
- Py_CLEAR(self->handler);
- return 0;
-}
-
-static void
-NoteinTrig_dealloc(NoteinTrig* self)
-{
- pyo_DEALLOC
- NoteinTrig_clear(self);
- self->ob_type->tp_free((PyObject*)self);
-}
-
-static PyObject *
-NoteinTrig_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
- int i;
- PyObject *handlertmp=NULL, *multmp=NULL, *addtmp=NULL;
- NoteinTrig *self;
- self = (NoteinTrig *)type->tp_alloc(type, 0);
-
- self->voice = 0;
- self->mode = 0;
- self->modebuffer[0] = 0;
- self->modebuffer[1] = 0;
-
- INIT_OBJECT_COMMON
- Stream_setFunctionPtr(self->stream, NoteinTrig_compute_next_data_frame);
- self->mode_func_ptr = NoteinTrig_setProcMode;
-
- static char *kwlist[] = {"handler", "voice", "mode", "mul", "add", NULL};
-
- if (! PyArg_ParseTupleAndKeywords(args, kwds, "O|iiOO", kwlist, &handlertmp, &self->voice, &self->mode, &multmp, &addtmp))
- Py_RETURN_NONE;
-
- Py_XDECREF(self->handler);
- Py_INCREF(handlertmp);
- self->handler = (MidiNote *)handlertmp;
-
- if (multmp) {
- PyObject_CallMethod((PyObject *)self, "setMul", "O", multmp);
- }
-
- if (addtmp) {
- PyObject_CallMethod((PyObject *)self, "setAdd", "O", addtmp);
- }
-
- PyObject_CallMethod(self->server, "addStream", "O", self->stream);
-
- (*self->mode_func_ptr)(self);
-
- return (PyObject *)self;
-}
-
-static PyObject * NoteinTrig_getServer(NoteinTrig* self) { GET_SERVER };
-static PyObject * NoteinTrig_getStream(NoteinTrig* self) { GET_STREAM };
-static PyObject * NoteinTrig_setMul(NoteinTrig *self, PyObject *arg) { SET_MUL };
-static PyObject * NoteinTrig_setAdd(NoteinTrig *self, PyObject *arg) { SET_ADD };
-static PyObject * NoteinTrig_setSub(NoteinTrig *self, PyObject *arg) { SET_SUB };
-static PyObject * NoteinTrig_setDiv(NoteinTrig *self, PyObject *arg) { SET_DIV };
-
-static PyObject * NoteinTrig_play(NoteinTrig *self, PyObject *args, PyObject *kwds) { PLAY };
-static PyObject * NoteinTrig_stop(NoteinTrig *self) { STOP };
-
-static PyObject * NoteinTrig_multiply(NoteinTrig *self, PyObject *arg) { MULTIPLY };
-static PyObject * NoteinTrig_inplace_multiply(NoteinTrig *self, PyObject *arg) { INPLACE_MULTIPLY };
-static PyObject * NoteinTrig_add(NoteinTrig *self, PyObject *arg) { ADD };
-static PyObject * NoteinTrig_inplace_add(NoteinTrig *self, PyObject *arg) { INPLACE_ADD };
-static PyObject * NoteinTrig_sub(NoteinTrig *self, PyObject *arg) { SUB };
-static PyObject * NoteinTrig_inplace_sub(NoteinTrig *self, PyObject *arg) { INPLACE_SUB };
-static PyObject * NoteinTrig_div(NoteinTrig *self, PyObject *arg) { DIV };
-static PyObject * NoteinTrig_inplace_div(NoteinTrig *self, PyObject *arg) { INPLACE_DIV };
-
-static PyMemberDef NoteinTrig_members[] = {
-{"server", T_OBJECT_EX, offsetof(NoteinTrig, server), 0, "Pyo server."},
-{"stream", T_OBJECT_EX, offsetof(NoteinTrig, stream), 0, "Stream object."},
-{"mul", T_OBJECT_EX, offsetof(NoteinTrig, mul), 0, "Mul factor."},
-{"add", T_OBJECT_EX, offsetof(NoteinTrig, add), 0, "Add factor."},
-{NULL} /* Sentinel */
-};
-
-static PyMethodDef NoteinTrig_methods[] = {
-{"getServer", (PyCFunction)NoteinTrig_getServer, METH_NOARGS, "Returns server object."},
-{"_getStream", (PyCFunction)NoteinTrig_getStream, METH_NOARGS, "Returns stream object."},
-{"play", (PyCFunction)NoteinTrig_play, METH_VARARGS|METH_KEYWORDS, "Starts computing without sending sound to soundcard."},
-{"stop", (PyCFunction)NoteinTrig_stop, METH_NOARGS, "Stops computing."},
-{"setMul", (PyCFunction)NoteinTrig_setMul, METH_O, "Sets NoteinTrig mul factor."},
-{"setAdd", (PyCFunction)NoteinTrig_setAdd, METH_O, "Sets NoteinTrig add factor."},
-{"setSub", (PyCFunction)NoteinTrig_setSub, METH_O, "Sets inverse add factor."},
-{"setDiv", (PyCFunction)NoteinTrig_setDiv, METH_O, "Sets inverse mul factor."},
-{NULL} /* Sentinel */
-};
-
-static PyNumberMethods NoteinTrig_as_number = {
-(binaryfunc)NoteinTrig_add, /*nb_add*/
-(binaryfunc)NoteinTrig_sub, /*nb_subtract*/
-(binaryfunc)NoteinTrig_multiply, /*nb_multiply*/
-(binaryfunc)NoteinTrig_div, /*nb_divide*/
-0, /*nb_remainder*/
-0, /*nb_divmod*/
-0, /*nb_power*/
-0, /*nb_neg*/
-0, /*nb_pos*/
-0, /*(unaryfunc)array_abs,*/
-0, /*nb_nonzero*/
-0, /*nb_invert*/
-0, /*nb_lshift*/
-0, /*nb_rshift*/
-0, /*nb_and*/
-0, /*nb_xor*/
-0, /*nb_or*/
-0, /*nb_coerce*/
-0, /*nb_int*/
-0, /*nb_long*/
-0, /*nb_float*/
-0, /*nb_oct*/
-0, /*nb_hex*/
-(binaryfunc)NoteinTrig_inplace_add, /*inplace_add*/
-(binaryfunc)NoteinTrig_inplace_sub, /*inplace_subtract*/
-(binaryfunc)NoteinTrig_inplace_multiply, /*inplace_multiply*/
-(binaryfunc)NoteinTrig_inplace_div, /*inplace_divide*/
-0, /*inplace_remainder*/
-0, /*inplace_power*/
-0, /*inplace_lshift*/
-0, /*inplace_rshift*/
-0, /*inplace_and*/
-0, /*inplace_xor*/
-0, /*inplace_or*/
-0, /*nb_floor_divide*/
-0, /*nb_true_divide*/
-0, /*nb_inplace_floor_divide*/
-0, /*nb_inplace_true_divide*/
-0, /* nb_index */
-};
-
-PyTypeObject NoteinTrigType = {
-PyObject_HEAD_INIT(NULL)
-0, /*ob_size*/
-"_pyo.NoteinTrig_base", /*tp_name*/
-sizeof(NoteinTrig), /*tp_basicsize*/
-0, /*tp_itemsize*/
-(destructor)NoteinTrig_dealloc, /*tp_dealloc*/
-0, /*tp_print*/
-0, /*tp_getattr*/
-0, /*tp_setattr*/
-0, /*tp_compare*/
-0, /*tp_repr*/
-&NoteinTrig_as_number, /*tp_as_number*/
-0, /*tp_as_sequence*/
-0, /*tp_as_mapping*/
-0, /*tp_hash */
-0, /*tp_call*/
-0, /*tp_str*/
-0, /*tp_getattro*/
-0, /*tp_setattro*/
-0, /*tp_as_buffer*/
-Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_CHECKTYPES, /*tp_flags*/
-"NoteinTrig objects. Stream noteon or noteoff trigger from a Notein voice.", /* tp_doc */
-(traverseproc)NoteinTrig_traverse, /* tp_traverse */
-(inquiry)NoteinTrig_clear, /* tp_clear */
-0, /* tp_richcompare */
-0, /* tp_weaklistoffset */
-0, /* tp_iter */
-0, /* tp_iternext */
-NoteinTrig_methods, /* tp_methods */
-NoteinTrig_members, /* tp_members */
-0, /* tp_getset */
-0, /* tp_base */
-0, /* tp_dict */
-0, /* tp_descr_get */
-0, /* tp_descr_set */
-0, /* tp_dictoffset */
-0, /* tp_init */
-0, /* tp_alloc */
-NoteinTrig_new, /* tp_new */
-};
-
-=======
->>>>>>> upstream/0.7.6
typedef struct {
pyo_audio_HEAD
MidiNote *handler;
@@ -3844,8 +3586,6 @@ PyTypeObject MidiDelAdsrType = {
0, /* tp_alloc */
MidiDelAdsr_new, /* tp_new */
};
-<<<<<<< HEAD
-=======
typedef struct {
pyo_audio_HEAD
@@ -4011,4 +3751,3 @@ PyTypeObject RawMidiType = {
0, /* tp_alloc */
RawMidi_new, /* tp_new */
};
->>>>>>> upstream/0.7.6
diff --git a/src/objects/oscmodule.c b/src/objects/oscmodule.c
index 84edfad..e40c8cc 100644
--- a/src/objects/oscmodule.c
+++ b/src/objects/oscmodule.c
@@ -736,9 +736,6 @@ typedef struct {
static void
OscDataSend_compute_next_data_frame(OscDataSend *self)
{
-<<<<<<< HEAD
- int i;
-=======
int i, j = 0;
Py_ssize_t blobsize = 0;
PyObject *datalist = NULL;
@@ -746,7 +743,6 @@ OscDataSend_compute_next_data_frame(OscDataSend *self)
uint8_t midi[4];
lo_blob *blob = NULL;
->>>>>>> upstream/0.7.6
lo_message *msg;
char *path = PyString_AsString(self->address_path);
@@ -813,10 +809,6 @@ OscDataSend_compute_next_data_frame(OscDataSend *self)
if (blobdata != NULL)
free(blobdata);
}
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/0.7.6
}
static int
@@ -984,17 +976,12 @@ int OscDataReceive_handler(const char *path, const char *types, lo_arg **argv, i
{
OscDataReceive *self = user_data;
PyObject *tup, *result=NULL;
-<<<<<<< HEAD
- tup = PyTuple_New(argc+1);
- int i, ok = 0;
-=======
lo_blob *blob = NULL;
char *blobdata = NULL;
uint32_t blobsize = 0;
PyObject *charlist = NULL;
tup = PyTuple_New(argc+1);
int i, ok = 0, j = 0;
->>>>>>> upstream/0.7.6
Py_ssize_t lsize = PyList_Size(self->address_path);
for (i=0; i<lsize; i++) {
@@ -1065,10 +1052,7 @@ int OscDataReceive_handler(const char *path, const char *types, lo_arg **argv, i
}
Py_XDECREF(tup);
Py_XDECREF(result);
-<<<<<<< HEAD
-=======
Py_XDECREF(charlist);
->>>>>>> upstream/0.7.6
return 0;
}
diff --git a/utils/E-Pyo.py b/utils/E-Pyo.py
index 11ca37e..87d556a 100755
--- a/utils/E-Pyo.py
+++ b/utils/E-Pyo.py
@@ -485,17 +485,11 @@ if not READY:
s.gui(locals())
'''
-<<<<<<< HEAD
-TEMPLATE_NAMES = {98: "Header", 97: "Pyo", 96: "WxPython", 95: "Cecilia5", 94: "Zyne", 93: "Audio Interface", 92: "RadioPyo"}
-TEMPLATE_DICT = {98: HEADER_TEMPLATE, 97: PYO_TEMPLATE, 96: WXPYTHON_TEMPLATE, 95: CECILIA5_TEMPLATE,
- 94: ZYNE_TEMPLATE, 93: AUDIO_INTERFACE_TEMPLATE, 92: RADIOPYO_TEMPLATE}
-=======
TEMPLATE_NAMES = {98: "Header", 97: "Pyo", 96: "WxPython", 95: "Cecilia5",
94: "Zyne", 93: "Audio Interface", 92: "RadioPyo"}
TEMPLATE_DICT = {98: HEADER_TEMPLATE, 97: PYO_TEMPLATE, 96: WXPYTHON_TEMPLATE,
95: CECILIA5_TEMPLATE, 94: ZYNE_TEMPLATE,
93: AUDIO_INTERFACE_TEMPLATE, 92: RADIOPYO_TEMPLATE}
->>>>>>> upstream/0.7.6
TEMPLATE_PATH = os.path.join(RESOURCES_PATH, "templates")
if not os.path.isdir(TEMPLATE_PATH):
@@ -791,13 +785,9 @@ KEY_COMMANDS = {
}
############## Allowed Extensions ##############
-<<<<<<< HEAD
-ALLOWED_EXT = PREFERENCES.get("allowed_ext", ["py", "c5", "txt", "", "c", "h", "cpp", "hpp", "sh", "rst", "iss", "sg", "md", "jsfx-inc"])
-=======
ALLOWED_EXT = PREFERENCES.get("allowed_ext",
["py", "c5", "txt", "", "c", "h", "cpp", "hpp", "zy",
"sh", "rst", "iss", "sg", "md", "jsfx-inc", "lua", "css"])
->>>>>>> upstream/0.7.6
############## Pyo keywords ##############
tree = OBJECTS_TREE
@@ -952,25 +942,6 @@ class RunningThread(threading.Thread):
prelude = "export -n %s;export PATH=/usr/local/bin:/usr/local/lib:$PATH;" % vars_to_remove
if CALLER_NEED_TO_INVOKE_32_BIT:
self.proc = subprocess.Popen(['%s%s%s -u "%s"' % (prelude, SET_32_BIT_ARCH, WHICH_PYTHON, self.path)],
-<<<<<<< HEAD
- shell=True, cwd=self.cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- else:
- self.proc = subprocess.Popen(['%s%s -u "%s"' % (prelude, WHICH_PYTHON, self.path)], cwd=self.cwd,
- shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- elif PLATFORM == "darwin":
- if CALLER_NEED_TO_INVOKE_32_BIT:
- self.proc = subprocess.Popen(['%s%s -u "%s"' % (SET_32_BIT_ARCH, WHICH_PYTHON, self.path)],
- shell=True, cwd=self.cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- else:
- self.proc = subprocess.Popen(['%s -u "%s"' % (WHICH_PYTHON, self.path)], cwd=self.cwd,
- shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- elif PLATFORM == "win32":
- self.proc = subprocess.Popen([WHICH_PYTHON, "-u", self.path], cwd=self.cwd, shell=False,
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- else:
- self.proc = subprocess.Popen([WHICH_PYTHON, "-u", self.path], cwd=self.cwd,
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-=======
shell=True, cwd=self.cwd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
else:
self.proc = subprocess.Popen(['%s%s -u "%s"' % (prelude, WHICH_PYTHON, self.path)], cwd=self.cwd,
@@ -988,7 +959,6 @@ class RunningThread(threading.Thread):
else:
self.proc = subprocess.Popen([WHICH_PYTHON, "-u", self.path], cwd=self.cwd,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
->>>>>>> upstream/0.7.6
header = '=== Output log of process "%s", launched: %s ===\n' % (self.filename, time.strftime('"%d %b %Y %H:%M:%S"', time.localtime()))
data_event = DataEvent({"log": header, "pid": self.pid, "filename": self.filename, "active": True})
@@ -997,25 +967,18 @@ class RunningThread(threading.Thread):
log = ""
for line in self.proc.stdout.readline():
log = log + line
-<<<<<<< HEAD
-=======
log = log.replace(">>> ", "").replace("... ", "")
->>>>>>> upstream/0.7.6
data_event = DataEvent({"log": log, "pid": self.pid, "filename": self.filename, "active": True})
wx.PostEvent(self.event_receiver, data_event)
sys.stdout.flush()
time.sleep(.025)
stdout, stderr = self.proc.communicate()
-<<<<<<< HEAD
- output = stdout + stderr
-=======
output = ""
if stdout is not None:
output = output + stdout
if stderr is not None:
output = output + stderr
output = output.replace(">>> ", "").replace("... ", "")
->>>>>>> upstream/0.7.6
if "StartNotification name = default" in output:
output = output.replace("StartNotification name = default", "")
if "epyo_tempfile.py" in output:
@@ -1042,9 +1005,6 @@ class RunningThread(threading.Thread):
pass
if self.terminated:
output = output + "\n=== Process killed. ==="
-<<<<<<< HEAD
- data_event = DataEvent({"log": output, "pid": self.pid, "filename": self.filename, "active": False})
-=======
data_event = DataEvent({"log": output, "pid": self.pid,
"filename": self.filename, "active": False})
wx.PostEvent(self.event_receiver, data_event)
@@ -1135,7 +1095,6 @@ class BackgroundServerThread(threading.Thread):
data_event = DataEvent({"log": output, "pid": self.pid,
"filename": 'background_server.py',
"active": False})
->>>>>>> upstream/0.7.6
wx.PostEvent(self.event_receiver, data_event)
class KeyCommandsFrame(wx.Frame):
@@ -2212,8 +2171,6 @@ class MainFrame(wx.Frame):
menu2.Append(121, "Insert File Path...\tShift+Ctrl+P")
self.Bind(wx.EVT_MENU, self.insertPath, id=121)
menu2.AppendSeparator()
-<<<<<<< HEAD
-=======
submenublk = wx.Menu()
submenublk.Append(400, "Insert Code Block Head\tCtrl+B")
submenublk.Append(401, "Insert Code Block Tail\tShift+Ctrl+B")
@@ -2221,7 +2178,6 @@ class MainFrame(wx.Frame):
self.Bind(wx.EVT_MENU, self.onCodeBlock, id=400, id2=402)
menu2.AppendMenu(-1, "Code Blocks", submenublk)
menu2.AppendSeparator()
->>>>>>> upstream/0.7.6
menu2.Append(114, "Auto Complete container syntax", kind=wx.ITEM_CHECK)
self.Bind(wx.EVT_MENU, self.autoCompContainer, id=114)
menu2.Check(114, PREFERENCES.get("auto_comp_container", 0))
@@ -2264,11 +2220,7 @@ class MainFrame(wx.Frame):
self.menu3.AppendSeparator()
self.backServerItem = self.menu3.Append(304, "Start Pyo Background Server")
self.Bind(wx.EVT_MENU, self.startStopBackgroundServer, id=304)
-<<<<<<< HEAD
- self.sendToServerItem = self.menu3.Append(305, "Send Line/Selection to Pyo Background Server\tCtrl+T")
-=======
self.sendToServerItem = self.menu3.Append(305, "Send Line/Selection to Pyo Background Server\tCtrl+.")
->>>>>>> upstream/0.7.6
self.sendToServerItem.Enable(False)
self.Bind(wx.EVT_MENU, self.sendSelectionToBackgroundServer, id=305)
self.menuBar.Append(self.menu3, 'Process')
@@ -2449,8 +2401,6 @@ class MainFrame(wx.Frame):
if rect.x > self.field1X+160:
self.cc.SetPosition((rect.x, rect.y+yoff2))
-<<<<<<< HEAD
-=======
def onCodeBlock(self, evt):
if evt.GetId() == 400:
self.panel.editor.insertBlockHead()
@@ -2459,7 +2409,6 @@ class MainFrame(wx.Frame):
elif evt.GetId() == 402:
self.panel.editor.selectCodeBlock()
->>>>>>> upstream/0.7.6
def setMasterDocument(self, evt):
if self.master_document == None:
self.master_document = self.panel.editor.path
@@ -3284,7 +3233,6 @@ class MainFrame(wx.Frame):
self.sendToServerItem.Enable(False)
def startStopBackgroundServer(self, evt):
- # TODO: need to add midi output driver
if not self.back_server_started:
self.prepareBackgroundServer()
cwd = self.getCurrentWorkingDirectory()
@@ -3311,15 +3259,8 @@ class MainFrame(wx.Frame):
text = self.panel.editor.GetLineUTF8(line)
else:
end = self.panel.editor.GetSelectionEnd()
-<<<<<<< HEAD
- if self.server_pipe != None:
- for line in text.splitlines():
- self.server_pipe.write(line + "\n")
- self.server_pipe.write("\n")
-=======
if self.back_server_started:
self.processes[1000][0].sendText(text)
->>>>>>> upstream/0.7.6
if end != None:
self.panel.editor.SetCurrentPos(end)
self.panel.editor.LineDown()
@@ -3656,10 +3597,7 @@ class Editor(stc.StyledTextCtrl):
self.Bind(stc.EVT_STC_UPDATEUI, self.OnUpdateUI)
self.Bind(stc.EVT_STC_MARGINCLICK, self.OnMarginClick)
self.Bind(wx.EVT_CLOSE, self.OnClose)
-<<<<<<< HEAD
-=======
self.Bind(wx.EVT_LEFT_DCLICK, self.OnDoubleClick)
->>>>>>> upstream/0.7.6
self.EmptyUndoBuffer()
self.SetFocus()
@@ -3843,8 +3781,6 @@ class Editor(stc.StyledTextCtrl):
self.StyleSetSpec(stc.STC_C_OPERATOR, buildStyle('operator'))
self.StyleSetSpec(stc.STC_C_IDENTIFIER, buildStyle('default'))
self.StyleSetSpec(stc.STC_C_PREPROCESSOR, buildStyle('commentblock'))
-<<<<<<< HEAD
-=======
elif ext == "md":
self.SetLexer(stc.STC_LEX_MARKDOWN)
self.SetStyleBits(self.GetStyleBitsNeeded())
@@ -3896,7 +3832,6 @@ class Editor(stc.StyledTextCtrl):
self.StyleSetSpec(stc.STC_LUA_WORD7, buildStyle('pyokeyword'))
self.StyleSetSpec(stc.STC_LUA_WORD8, buildStyle('pyokeyword'))
self.StyleSetSpec(stc.STC_LUA_LABEL, buildStyle('default') + ",italic,bold")
->>>>>>> upstream/0.7.6
self.SetEdgeColour(STYLES["lineedge"]['colour'])
self.SetCaretForeground(STYLES['caret']['colour'])
@@ -3908,8 +3843,6 @@ class Editor(stc.StyledTextCtrl):
# WxPython 3 needs the lexer to be set before folding property
self.SetProperty("fold", "1")
-<<<<<<< HEAD
-=======
def insertBlockHead(self):
pos = self.PositionFromLine(self.GetCurrentLine())
@@ -3961,7 +3894,6 @@ class Editor(stc.StyledTextCtrl):
else:
if evt is not None:
evt.Skip()
->>>>>>> upstream/0.7.6
def OnQuickSearch(self, str, next=True):
if self.GetSelection() != (0,0):
@@ -4448,17 +4380,10 @@ class Editor(stc.StyledTextCtrl):
dlg.ShowModal()
except:
pass
-<<<<<<< HEAD
-
- def OnChar(self, evt):
- propagate = True
-
-=======
def OnChar(self, evt):
propagate = True
->>>>>>> upstream/0.7.6
if chr(evt.GetKeyCode()) in ['[', '{', '(', '"', '`'] and self.auto_comp_container:
if chr(evt.GetKeyCode()) == '[':
self.AddText('[]')
@@ -4565,13 +4490,6 @@ class Editor(stc.StyledTextCtrl):
elif evt.GetKeyCode() == ord('L') and ControlDown():
self.GetParent().GetParent().GetParent().GetParent().GetParent().gotoLine(None)
propagate = False
-<<<<<<< HEAD
- # Send line/selection to pyo background server
- elif evt.GetKeyCode() == ord('T') and ControlDown():
- self.GetParent().GetParent().GetParent().GetParent().GetParent().sendSelectionToBackgroundServer(None)
- propagate = False
-=======
->>>>>>> upstream/0.7.6
# Process Return key --- automatic indentation
elif evt.GetKeyCode() == wx.WXK_RETURN:
@@ -4652,11 +4570,7 @@ class Editor(stc.StyledTextCtrl):
# for i in range(self.GetLineCount()):
# pos = self.GetLineEndPosition(i)
# if self.GetCharAt(pos-1) != 172:
-<<<<<<< HEAD
- # self.InsertTextUTF8(pos, "¬")
-=======
# self.InsertTextUTF8(pos, "¬")
->>>>>>> upstream/0.7.6
self.moveMarkers()
self.checkScrollbar()
self.OnModified()
@@ -4782,7 +4696,6 @@ class Editor(stc.StyledTextCtrl):
if lastChild > lineNum:
self.HideLines(lineNum+1, lastChild)
lineNum = lineNum + 1
-<<<<<<< HEAD
def ExpandAll(self):
lineCount = self.GetLineCount()
@@ -4796,21 +4709,6 @@ class Editor(stc.StyledTextCtrl):
lineNum = lineNum - 1
lineNum = lineNum + 1
-=======
-
- 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
-
->>>>>>> upstream/0.7.6
def ToggleFoldAll(self):
lineCount = self.GetLineCount()
expanding = True
@@ -5040,11 +4938,7 @@ class OutputLogPanel(wx.Panel):
self.processPopup.Append("%d :: %s" % (procID, filename))
self.processPopup.SetStringSelection("%d :: %s" % (procID, filename))
self.running += 1
-<<<<<<< HEAD
- self.runningLabel.SetLabel("Running: %d" % self.running)
-=======
self.runningLabel.SetLabel(" Running: %d" % self.running)
->>>>>>> upstream/0.7.6
self.editor.setLog("")
def removeProcess(self, procID, filename):
@@ -5066,9 +4960,6 @@ class OutputLogPanel(wx.Panel):
def appendToLog(self, text):
self.editor.appendToLog(text)
- def appendToLog(self, text):
- self.editor.appendToLog(text)
-
def setLog(self, text):
self.editor.setLog(text)
@@ -5163,11 +5054,6 @@ class ProjectTree(wx.Panel):
self.toolbar.AddLabelTool(TOOL_REFRESH_TREE_ID, "Refresh Tree",
refresh_tree_bmp, shortHelp="Refresh Tree")
self.toolbar.EnableTool(TOOL_ADD_FILE_ID, False)
-<<<<<<< HEAD
- self.toolbar.AddLabelTool(TOOL_ADD_FOLDER_ID, "Add Folder", folder_add_bmp, shortHelp="Add Folder")
- self.toolbar.AddLabelTool(TOOL_REFRESH_TREE_ID, "Refresh Tree", refresh_tree_bmp, shortHelp="Refresh Tree")
-=======
->>>>>>> upstream/0.7.6
self.toolbar.Realize()
toolbarbox.Add(self.toolbar, 1, wx.ALIGN_LEFT | wx.EXPAND, 0)
@@ -5246,12 +5132,8 @@ class ProjectTree(wx.Panel):
expanded = []
self._tree_analyze(self.root, expanded)
self.tree.DeleteAllItems()
-<<<<<<< HEAD
- self.root = self.tree.AddRoot("EPyo_Project_tree", self.fldridx, self.fldropenidx, None)
-=======
self.root = self.tree.AddRoot("EPyo_Project_tree", self.fldridx,
self.fldropenidx, None)
->>>>>>> upstream/0.7.6
for folder, path in self.projectDict.items():
self.loadFolder(path)
self._tree_restore(self.root, expanded)
@@ -5405,19 +5287,7 @@ class ProjectTree(wx.Panel):
def openPage(self, item):
hasChild = self.tree.ItemHasChildren(item)
if not hasChild:
-<<<<<<< HEAD
- parent = None
- ritem = item
- filename = self.tree.GetItemText(ritem)
- while self.tree.GetItemParent(ritem) != self.tree.GetRootItem():
- ritem = self.tree.GetItemParent(ritem)
- parent = self.tree.GetItemText(ritem)
- filename = os.path.join(parent, filename)
- dirPath = os.path.split(self.projectDict[parent])[0]
- path = os.path.join(dirPath, filename)
-=======
path = self.tree.GetPyData(item)
->>>>>>> upstream/0.7.6
self.mainPanel.addPage(path)
def select(self, item):
@@ -6236,22 +6106,14 @@ class EPyoApp(wx.App):
wx.App.__init__(self, *args, **kwargs)
def OnInit(self):
-<<<<<<< HEAD
- X,Y = wx.SystemSettings.GetMetric(wx.SYS_SCREEN_X), wx.SystemSettings.GetMetric(wx.SYS_SCREEN_Y)
-=======
X = wx.SystemSettings.GetMetric(wx.SYS_SCREEN_X)
Y = wx.SystemSettings.GetMetric(wx.SYS_SCREEN_Y)
->>>>>>> upstream/0.7.6
if X < 850: X -= 50
else: X = 850
if Y < 750: Y -= 50
else: Y = 750
-<<<<<<< HEAD
- self.frame = MainFrame(None, -1, title='E-Pyo Editor', pos=(10,25), size=(X, Y))
-=======
self.frame = MainFrame(None, -1, title='E-Pyo Editor',
pos=(10,25), size=(X, Y))
->>>>>>> upstream/0.7.6
self.frame.Show()
return True
diff --git a/utils/info.plist b/utils/info.plist
index 6b68d78..70c56f7 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.5</string>
-=======
<string>0.7.6</string>
->>>>>>> upstream/0.7.6
<key>CFBundleName</key>
<string>E-Pyo</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
-<<<<<<< HEAD
- <string>0.7.5</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>0.7.5</string>
-=======
<string>0.7.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.7.6</string>
->>>>>>> upstream/0.7.6
<key>LSHasLocalizedDisplayName</key>
<false/>
<key>NSAppleScriptEnabled</key>
--
python-pyo packaging
More information about the pkg-multimedia-commits
mailing list