From: Jinkun Jang Date: Wed, 13 Mar 2013 00:06:05 +0000 (+0900) Subject: sync X-Git-Tag: 2.1b_release^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_2.1;p=platform%2Fupstream%2Flibremix.git sync --- diff --git a/debian/libremix-dev.install b/debian/libremix-dev.install deleted file mode 100644 index b5a812f..0000000 --- a/debian/libremix-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -debian/tmp/usr/include/* -debian/tmp/usr/lib/lib*.la -debian/tmp/usr/lib/lib*.a -debian/tmp/usr/lib/libremix.so -debian/tmp/usr/lib/libctxdata.so -debian/tmp/usr/lib/pkgconfig/* diff --git a/remix.spec b/remix.spec deleted file mode 100644 index 539e8c7..0000000 --- a/remix.spec +++ /dev/null @@ -1,58 +0,0 @@ - -%define name remix -%define version 0.2.3 -%define release 1 -%define prefix /usr - -Summary: An audio rendering library -Name: %{name} -Version: %{version} -Release: %{release} -Prefix: %{prefix} -Copyright: LGPL -Group: Libraries/Sound -Source: http://www.metadecks.org/software/remix/download/libremix-%{version}.tar.gz -URL: http://www.metadecks.org/software/remix/ -BuildRoot: /var/tmp/%{name}-%{version} - -%description -Remix is a library for rendering audio data. - -%package devel -Summary: Libraries, includes, etc to develop remix applications -Group: Libraries - -%description devel -Libraries, include files, etc you can use to develop remix applications. - -%prep -%setup - -%build -./configure --prefix=%{prefix} -make - -%install -if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi -mkdir -p $RPM_BUILD_ROOT -make prefix=$RPM_BUILD_ROOT%{prefix} install - -%clean -if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi - -%files -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO doc -%prefix/lib/libremix.so.* - -%files devel -%defattr(-,root,root) -%{prefix}/lib/libremix.a -%{prefix}/lib/libremix.la -%{prefix}/lib/libremix.so -%{prefix}/include/remix.h -%{prefix}/include/remix_plugin.h - -%changelog -* Tue Sep 18 2001 Conrad Parker -- Created axel.spec.in (hacked from libsndfile.spec.in) diff --git a/src/examples/M1F1-int16-AFsp.wav b/src/examples/M1F1-int16-AFsp.wav deleted file mode 100644 index 26a744b..0000000 Binary files a/src/examples/M1F1-int16-AFsp.wav and /dev/null differ diff --git a/src/examples/simple_sndfiledemo.c b/src/examples/simple_sndfiledemo.c deleted file mode 100755 index 55bfec5..0000000 --- a/src/examples/simple_sndfiledemo.c +++ /dev/null @@ -1,61 +0,0 @@ - -#include -#include - -#include - -int -main (int argc, char ** argv) -{ - RemixEnv * env; - RemixDeck * deck; - RemixTrack * track; - RemixLayer * l1, * l2, * sample_layer; - RemixBase * sf1; - RemixBase * player; - RemixCount length; - RemixPlugin * sf_plugin; - RemixPlugin * player_plugin; - - CDSet * sf_parms; - int i; - int sf_path_key; - RemixSound * sound; - - env = remix_init (); - remix_set_samplerate(env, 8000); - printf( "remix sample rate: %f\n", remix_get_samplerate(env)); - remix_set_channels (env, REMIX_STEREO); - - - //############################ Setting files for MIXING ######################## - sf_plugin = remix_find_plugin (env, "builtin::sndfile_reader"); // keep the plugin list, no need to lookup everytime - if (sf_plugin == NULL) { - fprintf (stderr, "sf_plugin == NULL\n"); - exit (1); - } - sf_parms = cd_set_new (env); - sf_path_key = remix_get_init_parameter_key (env, sf_plugin, "path"); - sf_parms = cd_set_insert (env, sf_parms, sf_path_key, CD_STRING(SAMPLEDIR "/M1F1-int16-AFsp.wav")); - sf1 = remix_new (env, sf_plugin, sf_parms); - - deck = remix_deck_new (env); - track = remix_track_new (env, deck); - l1 = remix_layer_new_ontop (env, track, REMIX_TIME_SAMPLES); - remix_sound_new (env, (RemixBase *)sf1, l1, REMIX_SAMPLES(7000), REMIX_SAMPLES(35000) ); - //################################################################################ - - ///////////////////////////////// ADDING PLAYER //////////////// - sample_layer = remix_layer_new_ontop (env, track, REMIX_TIME_SAMPLES); - player_plugin = remix_find_plugin (env, "stream_player"); // keep the plugin list, no need to lookup everytime - if (player_plugin == NULL) { - fprintf (stderr, "player_plugin == NULL\n"); - exit (1); - } - player = remix_new (env, player_plugin, NULL); - remix_sound_new (env, (RemixBase *)player, sample_layer, REMIX_SAMPLES(0), REMIX_SAMPLES(35000)); - ////////////////////////////////////////////////////////////////// - - remix_process (env, deck, 35000, RemixNone, RemixNone); - exit (0); -} diff --git a/src/examples/simple_squaredemo.c b/src/examples/simple_squaredemo.c deleted file mode 100755 index 00d4497..0000000 --- a/src/examples/simple_squaredemo.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * squaredemo.c - * - * Copyright (C) 2001 Commonwealth Scientific and Industrial Research - * Organisation (CSIRO), Australia. - * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, provided - * that the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation. No representations are made about the suitability of this - * software for any purpose. It is provided "as is" without express or - * implied warranty. - * - */ - -#include -#include - -#include - -#define remix_add_sound_B(a,s,l,t1,t2) \ - remix_sound_new ((a), (s), (l), REMIX_BEAT24S(t1), REMIX_BEAT24S(t2)) - -#define BEAT 24 -#define HALF_BEAT 12 -#define QUARTER_BEAT 6 -#define EIGHTH_BEAT 3 - -int -main (int argc, char ** argv) -{ - RemixEnv * env; - RemixDeck * deck, * deck2; - RemixTrack * track, * track2, * track3, * track4; - RemixLayer * l1, * l2, * l3, * l4, * l5; - RemixSound * s; - RemixSquareTone * square1, * square2, * square3, * square4, * square5; - RemixPlugin * noise_plugin; - RemixBase * noise; - RemixEnvelope * env1, * env2, * env3; - RemixEnvelope * ge; - RemixCount length; - RemixMonitor * monitor; - int b = 0, b2 = 0, mb; - - env = remix_init (); - - remix_set_tempo (env, 500); - remix_set_channels (env, REMIX_STEREO); - - square1 = remix_squaretone_new (env, 100.0); - remix_squaretone_add_channel (env, square1, 0 ); - - square2 = remix_squaretone_new (env, 200.0); - remix_squaretone_add_channel (env, square2, 0 ); - remix_squaretone_add_channel (env, square2, 1 ); - - square3 = remix_squaretone_new (env, 385.0); - remix_squaretone_add_channel (env, square3, 0 ); - - // square4 = remix_squaretone_new (env, 231.0); - // square5 = remix_squaretone_new (env, 165.0); - - monitor = remix_monitor_new (env); - - deck = remix_deck_new (env); - track = remix_track_new (env, deck); - l1 = remix_layer_new_ontop (env, track, REMIX_TIME_BEAT24S); - s = remix_sound_new (env, square1, l1, REMIX_BEAT24S(0), REMIX_BEAT24S(6)); - s = remix_sound_new (env, square2, l1, REMIX_BEAT24S(8), REMIX_BEAT24S(12)); - s = remix_sound_new (env, square3, l1, REMIX_BEAT24S(21), REMIX_BEAT24S(12)); - -/* - remix_track_set_gain (env, track2, 0.6); - - ge = remix_envelope_new (env, REMIX_ENVELOPE_LINEAR); - remix_envelope_set_timetype (env, ge, REMIX_TIME_SAMPLES); - remix_envelope_add_point (env, ge, REMIX_BEAT24S(2), 0.6); -*/ - - - length = remix_length (env, deck); - - l2 = remix_layer_new_ontop (env, track, REMIX_TIME_SAMPLES); - s = remix_sound_new (env, monitor, l2, REMIX_SAMPLES(0), REMIX_SAMPLES(length)); - //remix_sound_set_gain_envelope (env, s, ge); - - remix_process (env, deck, length, RemixNone, RemixNone); - - remix_purge (env); - - exit (0); -} -