Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[16840] pkg/trunk
|
From: <tf...@us...> - 2009-06-08 22:46:50
|
Revision: 16840
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=16840&view=rev
Author: tfoote
Date: 2009-06-08 22:46:38 +0000 (Mon, 08 Jun 2009)
Log Message:
-----------
creating audio_msgs packge ticket:1321
Modified Paths:
--------------
pkg/trunk/audio/audio_capture/audio_capture.cpp
pkg/trunk/audio/audio_capture/audio_clip_writer.cpp
pkg/trunk/audio/audio_capture/manifest.xml
Added Paths:
-----------
pkg/trunk/audio/audio_msgs/
pkg/trunk/audio/audio_msgs/CMakeLists.txt
pkg/trunk/audio/audio_msgs/Makefile
pkg/trunk/audio/audio_msgs/mainpage.dox
pkg/trunk/audio/audio_msgs/manifest.xml
pkg/trunk/audio/audio_msgs/msg/
pkg/trunk/audio/audio_msgs/msg/AudioRawStream.msg
Removed Paths:
-------------
pkg/trunk/common/robot_msgs/msg/AudioRawStream.msg
Modified: pkg/trunk/audio/audio_capture/audio_capture.cpp
===================================================================
--- pkg/trunk/audio/audio_capture/audio_capture.cpp 2009-06-08 21:33:32 UTC (rev 16839)
+++ pkg/trunk/audio/audio_capture/audio_capture.cpp 2009-06-08 22:46:38 UTC (rev 16840)
@@ -30,7 +30,7 @@
#include <cstdio>
#include <portaudio.h>
#include "ros/node.h"
-#include "robot_msgs/AudioRawStream.h"
+#include "audio_msgs/AudioRawStream.h"
const static int SAMPLE_RATE = 44100; // todo: make this a parameter.
ros::Node *g_audio_node = NULL;
@@ -44,7 +44,7 @@
const PaStreamCallbackTimeInfo *time_info,
PaStreamCallbackFlags status, void *user_data)
{
- static robot_msgs::AudioRawStream audio_msg;
+ static audio_msgs::AudioRawStream audio_msg;
audio_msg.num_channels = 1;
audio_msg.sample_rate = SAMPLE_RATE;
#ifdef GRATUITOUS_DEBUGGING
@@ -94,7 +94,7 @@
ros::init(argc, argv);
ros::Node n("audio_capture", ros::Node::DONT_HANDLE_SIGINT);
g_audio_node = &n;
- n.advertise<robot_msgs::AudioRawStream>("audio", 5);
+ n.advertise<audio_msgs::AudioRawStream>("audio", 5);
err = Pa_OpenDefaultStream(&stream, 1, 0, paFloat32, SAMPLE_RATE, 4096,
audio_cb, NULL);
if (err != paNoError)
Modified: pkg/trunk/audio/audio_capture/audio_clip_writer.cpp
===================================================================
--- pkg/trunk/audio/audio_capture/audio_clip_writer.cpp 2009-06-08 21:33:32 UTC (rev 16839)
+++ pkg/trunk/audio/audio_capture/audio_clip_writer.cpp 2009-06-08 22:46:38 UTC (rev 16840)
@@ -31,7 +31,7 @@
#include <deque>
#include <vector>
#include "ros/node.h"
-#include "robot_msgs/AudioRawStream.h"
+#include "audio_msgs/AudioRawStream.h"
#include <sndfile.h>
using std::deque;
@@ -156,7 +156,7 @@
uint64_t audio_clock;
enum { IDLE, CLIP_START, IN_CLIP } clip_state;
float window_power;
- robot_msgs::AudioRawStream audio_msg;
+ audio_msgs::AudioRawStream audio_msg;
deque<float> window;
vector<float> clip;
};
Modified: pkg/trunk/audio/audio_capture/manifest.xml
===================================================================
--- pkg/trunk/audio/audio_capture/manifest.xml 2009-06-08 21:33:32 UTC (rev 16839)
+++ pkg/trunk/audio/audio_capture/manifest.xml 2009-06-08 22:46:38 UTC (rev 16840)
@@ -4,7 +4,7 @@
<license>BSD</license>
<review status="unreviewed" notes=""/>
<depend package="roscpp"/>
- <depend package="robot_msgs"/>
+ <depend package="audio_msgs"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="portaudio19-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="portaudio19-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libsndfile1-dev"/>
Added: pkg/trunk/audio/audio_msgs/CMakeLists.txt
===================================================================
--- pkg/trunk/audio/audio_msgs/CMakeLists.txt (rev 0)
+++ pkg/trunk/audio/audio_msgs/CMakeLists.txt 2009-06-08 22:46:38 UTC (rev 16840)
@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 2.4.6)
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+
+# Set the build type. Options are:
+# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage
+# Debug : w/ debug symbols, w/o optimization
+# Release : w/o debug symbols, w/ optimization
+# RelWithDebInfo : w/ debug symbols, w/ optimization
+# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
+#set(ROS_BUILD_TYPE RelWithDebInfo)
+
+rospack(audio_msgs)
+
+#set the default path for built executables to the "bin" directory
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+#set the default path for built libraries to the "lib" directory
+set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+
+#uncomment if you have defined messages
+genmsg()
+#uncomment if you have defined services
+#gensrv()
+
+#common commands for building c++ executables and libraries
+#rospack_add_library(${PROJECT_NAME} src/example.cpp)
+#target_link_libraries(${PROJECT_NAME} another_library)
+#rospack_add_boost_directories()
+#rospack_link_boost(${PROJECT_NAME} thread)
+#rospack_add_executable(example examples/example.cpp)
+#target_link_libraries(example ${PROJECT_NAME})
Added: pkg/trunk/audio/audio_msgs/Makefile
===================================================================
--- pkg/trunk/audio/audio_msgs/Makefile (rev 0)
+++ pkg/trunk/audio/audio_msgs/Makefile 2009-06-08 22:46:38 UTC (rev 16840)
@@ -0,0 +1 @@
+include $(shell rospack find mk)/cmake.mk
\ No newline at end of file
Added: pkg/trunk/audio/audio_msgs/mainpage.dox
===================================================================
--- pkg/trunk/audio/audio_msgs/mainpage.dox (rev 0)
+++ pkg/trunk/audio/audio_msgs/mainpage.dox 2009-06-08 22:46:38 UTC (rev 16840)
@@ -0,0 +1,107 @@
+/**
+\mainpage
+\htmlinclude manifest.html
+
+\b audio_msgs is ... In addition to providing an overview of your package,
+this is the section where the specification and design/architecture
+should be detailed. While the original specification may be done on the
+wiki, it should be transferred here once your package starts to take shape.
+You can then link to this documentation page from the Wiki.
+
+
+\section codeapi Code API
+
+Provide links to specific auto-generated API documentation within your
+package that is of particular interest to a reader. Doxygen will
+document pretty much every part of your code, so do your best here to
+point the reader to the actual API.
+
+If your codebase is fairly large or has different sets of APIs, you
+should use the doxygen 'group' tag to keep these APIs together. For
+example, the roscpp documentation has 'libros' group
+so that it can be viewed separately. The rospy documentation
+similarly has a 'client-api' group that pulls together APIs for a
+Client API page.
+
+
+\section rosapi ROS API
+
+Names are very important in ROS because they can be remapped on the
+command-line, so it is VERY IMPORTANT THAT YOU LIST NAMES AS THEY
+APPEAR IN THE CODE. You should list names of every topic, service and
+parameter used in your code.
+
+List of nodes:
+- \b node_name1
+- \b node_name2
+
+<!-- START: copy for each node -->
+
+<hr>
+
+\subsection node_name node_name
+
+node_name does (provide a basic description of your node)
+
+\subsubsection Usage
+\verbatim
+$ node_type1 [standard ROS args]
+\endverbatim
+
+\par Example
+
+\verbatim
+$ node_type1
+\endverbatim
+
+
+\subsubsection topics ROS topics
+
+Subscribes to:
+- \b "in": [std_msgs/FooType] description of in
+
+Publishes to:
+- \b "out": [std_msgs/FooType] description of out
+
+\subsubsection parameters ROS parameters
+
+Reads the following parameters from the parameter server
+
+- \b "~param_name" : \b [type] description of param_name
+- \b "~my_param" : \b [string] description of my_param
+
+Sets the following parameters on the parameter server
+
+- \b "~param_name" : \b [type] description of param_name
+
+
+\subsubsection services ROS services
+- \b "foo_service": [std_srvs/FooType] description of foo_service
+
+
+<!-- END: copy for each node -->
+
+\section commandline Command-line tools
+
+This section is a catch-all for any additional tools that your package
+provides or uses that may be of use to the reader. For example:
+
+- tools/scripts (e.g. rospack, roscd)
+- roslaunch .launch files
+- xmlparam files
+
+\subsection script_name script_name
+
+Description of what this script/file does.
+
+\subsubsection Usage
+\verbatim
+$ ./script_name [args]
+\endverbatim
+
+\par Example
+
+\verbatim
+$ ./script_name foo bar
+\endverbatim
+*/
\ No newline at end of file
Added: pkg/trunk/audio/audio_msgs/manifest.xml
===================================================================
--- pkg/trunk/audio/audio_msgs/manifest.xml (rev 0)
+++ pkg/trunk/audio/audio_msgs/manifest.xml 2009-06-08 22:46:38 UTC (rev 16840)
@@ -0,0 +1,18 @@
+<package>
+ <description brief="audio_msgs">
+
+ audio_msgs
+
+ </description>
+ <author>Morgan Quigley<author>
+ <license>BSD</license>
+ <review status="unreviewed" notes=""/>
+ <url>http://pr.willowgarage.com/wiki/audio_msgs</url>
+ <export>
+ <cpp cflags="-I${prefix}/msg/cpp"/>
+ </export>
+
+
+</package>
+
+
Copied: pkg/trunk/audio/audio_msgs/msg/AudioRawStream.msg (from rev 14615, pkg/trunk/common/robot_msgs/msg/AudioRawStream.msg)
===================================================================
--- pkg/trunk/audio/audio_msgs/msg/AudioRawStream.msg (rev 0)
+++ pkg/trunk/audio/audio_msgs/msg/AudioRawStream.msg 2009-06-08 22:46:38 UTC (rev 16840)
@@ -0,0 +1,4 @@
+float32[] samples
+uint32 num_channels
+uint32 sample_rate
+
Deleted: pkg/trunk/common/robot_msgs/msg/AudioRawStream.msg
===================================================================
--- pkg/trunk/common/robot_msgs/msg/AudioRawStream.msg 2009-06-08 21:33:32 UTC (rev 16839)
+++ pkg/trunk/common/robot_msgs/msg/AudioRawStream.msg 2009-06-08 22:46:38 UTC (rev 16840)
@@ -1,4 +0,0 @@
-float32[] samples
-uint32 num_channels
-uint32 sample_rate
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
