Skip to content
Browse files

v0.34

  • Loading branch information...
1 parent 44e9e6b commit fd960fff290aabb07724f46267137268768795b7 @Sciss committed Apr 19, 2012
View
2 README.md
@@ -8,7 +8,7 @@ Strictly speaking, this is Wolkenpumpe 5th generation. For generation four, base
### requirements
-Builds with xsbt (sbt 0.11) against Scala 2.9.1. Depends on [ScalaCollider](http://github.com/Sciss/ScalaCollider) and [SoundProcesses](http://github.com/Sciss/SoundProcesses). Standard sbt targets are `clean`, `update`, `compile`, `package`, `doc`, `publish-local`.
+Builds with xsbt (sbt 0.11) against Scala 2.9.2. Depends on [ScalaCollider](http://github.com/Sciss/ScalaCollider) and [SoundProcesses](http://github.com/Sciss/SoundProcesses). Standard sbt targets are `clean`, `update`, `compile`, `package`, `doc`, `publish-local`.
### creating an IntelliJ IDEA project
View
57 build.sbt
@@ -1,15 +1,20 @@
name := "wolkenpumpe"
-version := "0.34-SNAPSHOT"
+version := "0.34"
organization := "de.sciss"
-scalaVersion := "2.9.1"
+homepage := Some( url( "https://github.com/Sciss/Wolkenpumpe" ))
+
+description := "A Prefuse based visual interface for SoundProcesses, a sound synthesis framework"
+
+licenses := Seq( "GPL v2+" -> url( "http://www.gnu.org/licenses/gpl-2.0.txt" ))
+
+scalaVersion := "2.9.2"
libraryDependencies ++= Seq(
"de.sciss" % "prefuse-core" % "0.21",
-// "de.sciss" %% "scalacollider" % "0.32-SNAPSHOT",
- "de.sciss" %% "soundprocesses" % "0.34-SNAPSHOT"
+ "de.sciss" %% "soundprocesses" % "0.34"
)
retrieveManaged := true
@@ -18,20 +23,42 @@ scalacOptions ++= Seq( "-deprecation", "-unchecked" )
// ---- publishing ----
+publishMavenStyle := true
+
publishTo <<= version { (v: String) =>
- Some( "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/".+(
- if( v.endsWith( "-SNAPSHOT")) "snapshots/" else "releases/"
- ))
+ Some( if( v.endsWith( "-SNAPSHOT" ))
+ "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
+ else
+ "Sonatype Releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+ )
}
+publishArtifact in Test := false
+
+pomIncludeRepository := { _ => false }
+
pomExtra :=
-<licenses>
- <license>
- <name>GPL v2+</name>
- <url>http://www.gnu.org/licenses/gpl-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
-</licenses>
+<scm>
+ <url>git@github.com:Sciss/Wolkenpumpe.git</url>
+ <connection>scm:git:git@github.com:Sciss/Wolkenpumpe.git</connection>
+</scm>
+<developers>
+ <developer>
+ <id>sciss</id>
+ <name>Hanns Holger Rutz</name>
+ <url>http://www.sciss.de</url>
+ </developer>
+</developers>
+
+// ---- ls.implicit.ly ----
+
+seq( lsSettings :_* )
+
+(LsKeys.tags in LsKeys.lsync) := Seq( "sound-synthesis", "gui", "sound", "music", "supercollider" )
+
+(LsKeys.ghUser in LsKeys.lsync) := Some( "Sciss" )
-credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
+(LsKeys.ghRepo in LsKeys.lsync) := Some( "Wolkenpumpe" )
+// bug in ls -- doesn't find the licenses from global scope
+(licenses in LsKeys.lsync) := Seq( "GPL v2+" -> url( "http://www.gnu.org/licenses/gpl-2.0.txt" ))
View
2 licenses/NuagesPompe-License.txt
@@ -1,7 +1,7 @@
/*
* NuagesPompe
*
- * Copyright (c) 2008-2010 Hanns Holger Rutz. All rights reserved.
+ * Copyright (c) 2008-2012 Hanns Holger Rutz. All rights reserved.
*
* This software is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
View
2 licenses/ScalaAudioFile-License.txt
@@ -1,7 +1,7 @@
/*
* ScalaAudioFile
*
- * Copyright (c) 2004-2010 Hanns Holger Rutz. All rights reserved.
+ * Copyright (c) 2004-2012 Hanns Holger Rutz. All rights reserved.
*
* This software is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
View
2 licenses/ScalaCollider-License.txt
@@ -1,7 +1,7 @@
/*
* ScalaCollider
*
- * Copyright (c) 2008-2010 Hanns Holger Rutz. All rights reserved.
+ * Copyright (c) 2008-2012 Hanns Holger Rutz. All rights reserved.
*
* This software is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
View
2 licenses/ScalaColliderSwing-License.txt
@@ -1,7 +1,7 @@
/*
* ScalaCollider-Swing
*
- * Copyright (c) 2008-2010 Hanns Holger Rutz. All rights reserved.
+ * Copyright (c) 2008-2012 Hanns Holger Rutz. All rights reserved.
*
* This software is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
View
40 licenses/ScalaInterpreterPane-License.txt
@@ -1,24 +1,24 @@
-/*
+/*
* ScalaInterpreterPane
- *
- * Copyright (c) 2010 Hanns Holger Rutz. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * Below is a copy of the GNU Lesser General Public License
- *
- * For further information, please contact Hanns Holger Rutz at
- * contact@sciss.de
- *
- */
+ *
+ * Copyright (c) 2010-2012 Hanns Holger Rutz. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Below is a copy of the GNU Lesser General Public License
+ *
+ * For further information, please contact Hanns Holger Rutz at
+ * contact@sciss.de
+ *
+ */
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
View
2 licenses/ScalaOSC-License.txt
@@ -1,7 +1,7 @@
/*
* ScalaOSC
*
- * Copyright (c) 2008-2010 Hanns Holger Rutz. All rights reserved.
+ * Copyright (c) 2008-2012 Hanns Holger Rutz. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
View
4 licenses/SoundProcesses-License.txt
@@ -1,7 +1,7 @@
/*
- * SoundProcesses (aka ScalaCollider-Proc)
+ * SoundProcesses
*
- * Copyright (c) 2008-2010 Hanns Holger Rutz. All rights reserved.
+ * Copyright (c) 2008-2012 Hanns Holger Rutz. All rights reserved.
*
* This software is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
View
2 licenses/Wolkenpumpe-License.txt
@@ -1,7 +1,7 @@
/*
* Wolkenpumpe
*
- * Copyright (c) 2008-2010 Hanns Holger Rutz. All rights reserved.
+ * Copyright (c) 2008-2012 Hanns Holger Rutz. All rights reserved.
*
* This software is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
View
5 project/plugins.sbt
@@ -0,0 +1,5 @@
+resolvers ++= Seq(
+ "less is" at "http://repo.lessis.me",
+ "coda" at "http://repo.codahale.com")
+
+addSbtPlugin( "me.lessis" % "ls-sbt" % "0.1.1" )
View
26 src/main/ls/0.34.json
@@ -0,0 +1,26 @@
+
+{
+ "organization":"de.sciss",
+ "name":"wolkenpumpe",
+ "version":"0.34",
+ "description":"A Prefuse based visual interface for SoundProcesses, a sound synthesis framework",
+ "site":"https://github.com/Sciss/Wolkenpumpe",
+ "tags":["sound-synthesis","gui","sound","music","supercollider"],
+ "docs":"",
+ "licenses": [{
+ "name": "GPL v2+",
+ "url": "http://www.gnu.org/licenses/gpl-2.0.txt"
+ }],
+ "resolvers": ["http://scala-tools.org/repo-releases"],
+ "dependencies": [{
+ "organization":"de.sciss",
+ "name": "prefuse-core",
+ "version": "0.21"
+ },{
+ "organization":"de.sciss",
+ "name": "soundprocesses",
+ "version": "0.34"
+ }],
+ "scalas": ["2.9.2"],
+ "sbt": false
+}
View
20 src/main/scala/de/sciss/nuages/ConnectControl.scala
@@ -53,10 +53,10 @@ extends ControlAdapter with PaintListener {
def postPaint( d: Display, g: Graphics2D ) {
drag.foreach( dr => {
g.setColor( if( dr.target.isDefined ) Color.green else Color.red )
- val tgtX = dr.target.map( _.vi.getX() ).getOrElse( dr.targetLoc.getX() )
- val tgtY = dr.target.map( _.vi.getY() ).getOrElse( dr.targetLoc.getY() )
- val srcX = dr.source.vi.getX()
- val srcY = dr.source.vi.getY()
+ val tgtX = dr.target.map( _.vi.getX ).getOrElse( dr.targetLoc.getX )
+ val tgtY = dr.target.map( _.vi.getY ).getOrElse( dr.targetLoc.getY )
+ val srcX = dr.source.vi.getX
+ val srcY = dr.source.vi.getY
val lin = new Line2D.Double( srcX, srcY, tgtX, tgtY )
val trns = d.getTransform
val shp = trns.createTransformedShape( lin )
@@ -66,18 +66,18 @@ extends ControlAdapter with PaintListener {
override def itemPressed( vi: VisualItem, e: MouseEvent ) {
// if( !e.isControlDown() ) return
- if( !e.isShiftDown() ) return
+ if( !e.isShiftDown ) return
vi match {
case ni: NodeItem => {
val data = ni.get( COL_NUAGES ).asInstanceOf[ VisualData ]
if( data == null ) return
data match {
case vBus: VisualAudioOutput => {
val d = getDisplay( e )
- val displayPt = d.getAbsoluteCoordinate( e.getPoint(), null )
- val dr = new Drag( DragSource( vi, vBus ), displayPt, None )
+ val displayPt = d.getAbsoluteCoordinate( e.getPoint, null )
+ val dr = new Drag( DragSource( vi, vBus ), displayPt, None )
d.addPaintListener( control )
- drag = Some( dr )
+ drag = Some( dr )
}
case _ =>
}
@@ -111,7 +111,7 @@ extends ControlAdapter with PaintListener {
private def checkDrag( e: MouseEvent ) {
drag.foreach( dr => {
val d = getDisplay( e )
- val screenPt = e.getPoint()
+ val screenPt = e.getPoint
d.getAbsoluteCoordinate( screenPt, dr.targetLoc )
val vi = d.findItem( screenPt )
val tgt = vi match {
@@ -164,5 +164,5 @@ extends ControlAdapter with PaintListener {
})
}
- @inline private def getDisplay( e: MouseEvent ) = e.getComponent().asInstanceOf[ Display ]
+ @inline private def getDisplay( e: MouseEvent ) = e.getComponent.asInstanceOf[ Display ]
}
View
2 src/main/scala/de/sciss/nuages/PrefuseAggregateLayout.scala
@@ -20,7 +20,7 @@
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
View
8 src/main/scala/de/sciss/nuages/Wolkenpumpe.scala
@@ -33,7 +33,7 @@ import javax.swing.WindowConstants
object Wolkenpumpe /* extends TxnModel[ NuagesUpdate ]*/ {
val name = "Wolkenpumpe"
val version = 0.34
- val isSnapshot = true
+ val isSnapshot = false
val copyright = "(C)opyright 2004-2012 Hanns Holger Rutz"
def versionString = {
@@ -43,7 +43,7 @@ object Wolkenpumpe /* extends TxnModel[ NuagesUpdate ]*/ {
def main( args: Array[ String ]) {
if( args.size > 0 && args( 0 ) == "--test" ) {
- test
+ test()
} else {
printInfo()
sys.exit( 1 )
@@ -55,7 +55,7 @@ object Wolkenpumpe /* extends TxnModel[ NuagesUpdate ]*/ {
"This is a library which cannot be executed directly.\n" )
}
- def test {
+ def test() {
var s : Server = null
SynthGraph.warnOutsideContext = true
val booting = Server.boot() {
@@ -147,7 +147,7 @@ object Wolkenpumpe /* extends TxnModel[ NuagesUpdate ]*/ {
}
}
}
- Runtime.getRuntime().addShutdownHook( new Thread { override def run = {
+ Runtime.getRuntime.addShutdownHook( new Thread { override def run() {
if( (s != null) && (s.condition != Server.Offline) ) {
s.quit
s = null
View
2 src/main/scala/de/sciss/sonogram/IntensityColorScheme.scala
@@ -29,7 +29,7 @@
package de.sciss.sonogram
-import java.awt.{ Color }
+import java.awt.Color
import scala.math._
// colors from niklas werner's sonasound!

0 comments on commit fd960ff

Please sign in to comment.
Something went wrong with that request. Please try again.