Mercurial > octave-nkf

diff libinterp/dldfcn/recorder_class.h @ 19537:36a26a131209

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Apply Octave coding style to audio project additions * libinterp/dldfcn/__player_audioplayer__.cc, libinterp/dldfcn/__recorder_audiorecorder__.cc, libinterp/dldfcn/audiodevinfo.cc, libinterp/dldfcn/audioinfo.cc, libinterp/dldfcn/audioread.cc, libinterp/dldfcn/audiowrite.cc, libinterp/dldfcn/player_class.cc, libinterp/dldfcn/player_class.h, libinterp/dldfcn/recorder_class.cc, libinterp/dldfcn/recorder_class.h, scripts/audio/@audioplayer/__get_properties__.m, scripts/audio/@audioplayer/audioplayer.m, scripts/audio/@audioplayer/display.m, scripts/audio/@audioplayer/get.m, scripts/audio/@audioplayer/isplaying.m, scripts/audio/@audioplayer/pause.m, scripts/audio/@audioplayer/play.m, scripts/audio/@audioplayer/playblocking.m, scripts/audio/@audioplayer/resume.m, scripts/audio/@audioplayer/set.m, scripts/audio/@audioplayer/stop.m, scripts/audio/@audioplayer/subsasgn.m, scripts/audio/@audioplayer/subsref.m, scripts/audio/@audiorecorder/__get_properties__.m, scripts/audio/@audiorecorder/audiorecorder.m, scripts/audio/@audiorecorder/display.m, scripts/audio/@audiorecorder/get.m, scripts/audio/@audiorecorder/getaudiodata.m, scripts/audio/@audiorecorder/getplayer.m, scripts/audio/@audiorecorder/isrecording.m, scripts/audio/@audiorecorder/pause.m, scripts/audio/@audiorecorder/play.m, scripts/audio/@audiorecorder/record.m, scripts/audio/@audiorecorder/recordblocking.m, scripts/audio/@audiorecorder/resume.m, scripts/audio/@audiorecorder/set.m, scripts/audio/@audiorecorder/stop.m, scripts/audio/@audiorecorder/subsasgn.m, scripts/audio/@audiorecorder/subsref.m: Apply consistent Octave indentation, spacing, and quoting styles. Strip trailing whitespace. Remove braces from one-line if-else blocks. Simplify some variable declarations.
author Mike Miller <mtmiller@ieee.org>
date Thu, 03 Oct 2013 07:52:58 -0400
parents 8bb399569393
children
line wrap: on
line diff
--- a/libinterp/dldfcn/recorder_class.h	Wed Oct 02 00:14:09 2013 -0400
+++ b/libinterp/dldfcn/recorder_class.h	Thu Oct 03 07:52:58 2013 -0400
@@ -31,75 +31,75 @@
 
 #include "player_class.h"
 
-class audiorecorder : public octave_base_value 
+class audiorecorder : public octave_base_value
 {
 public:
-    audiorecorder();
-    ~audiorecorder();
-    // Overloaded base functions
-    double player_value() const { return 0; }
-    virtual double scalar_value (bool frc_str_conv = false) const 
-    {
-        return 0;
-    }
-    void print (std::ostream& os, bool pr_as_read_syntax = false) const;
-    void print_raw (std::ostream& os, bool pr_as_read_syntax) const;
-    // Properties
-    bool is_constant (void) const { return true;}
-    bool is_defined (void) const { return true;}
-    bool print_as_scalar (void) const { return true;}
+  audiorecorder (void);
+  ~audiorecorder (void) {};
+
+  // Overloaded base functions
+  double player_value (void) const { return 0; }
+  virtual double scalar_value (bool frc_str_conv = false) const { return 0; }
+  void print (std::ostream& os, bool pr_as_read_syntax = false) const;
+  void print_raw (std::ostream& os, bool pr_as_read_syntax) const;
 
-    void init();
-    void set_fs(int fs);
-    int get_fs();
-    void set_nbits(int nbits);
-    int get_nbits();
-    void set_id(int id);
-    int get_id();
-    void set_channels(int channels);
-    int get_channels();
-    audio_type get_type();
+  // Properties
+  bool is_constant (void) const { return true; }
+  bool is_defined (void) const { return true; }
+  bool print_as_scalar (void) const { return true; }
+
+  void init (void);
+  void set_fs (int fs);
+  int get_fs (void);
+  void set_nbits (int nbits);
+  int get_nbits (void);
+  void set_id (int id);
+  int get_id (void);
+  void set_channels (int channels);
+  int get_channels (void);
+  audio_type get_type (void);
 
-    void set_sample_number(unsigned int sample);
-    unsigned int get_sample_number();
-    unsigned int get_total_samples();
-    void set_end_sample(unsigned int sample);
-    unsigned int get_end_sample();
-    void reset_end_sample();
-    void set_tag(charMatrix tag);
-    charMatrix get_tag();
-    void set_userdata(octave_value userdata);
-    octave_value get_userdata();
-    PaStream *get_stream();
-    octave_function *octave_callback_function;
+  void set_sample_number (unsigned int sample);
+  unsigned int get_sample_number (void);
+  unsigned int get_total_samples (void);
+  void set_end_sample (unsigned int sample);
+  unsigned int get_end_sample (void);
+  void reset_end_sample (void);
+  void set_tag (charMatrix tag);
+  charMatrix get_tag (void);
+  void set_userdata (octave_value userdata);
+  octave_value get_userdata (void);
+  PaStream *get_stream (void);
+  octave_function *octave_callback_function;
 
-    octave_value getaudiodata();
-    audioplayer *getplayer();
-    bool isrecording();
-    audioplayer play();
-    void record();
-    void recordblocking(float seconds);
-    void pause();
-    void resume();
-    void stop();
-    void append(float sample_l, float sample_r);
+  octave_value getaudiodata (void);
+  audioplayer *getplayer (void);
+  bool isrecording (void);
+  audioplayer play (void);
+  void record (void);
+  void recordblocking (float seconds);
+  void pause (void);
+  void resume (void);
+  void stop (void);
+  void append (float sample_l, float sample_r);
+
 private:
-    Matrix y;
-    std::vector<float> left;
-    std::vector<float> right;
-    charMatrix tag;
-    octave_value userdata;
-    int channels;
-    int fs;
-    int nbits;
-    int id;
-    unsigned int sample_number;
-    unsigned int end_sample;
-    PaStream *stream;
-    PaStreamParameters input_parameters;
-    audio_type type;
-    DECLARE_OCTAVE_ALLOCATOR
-    DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
+  Matrix y;
+  std::vector<float> left;
+  std::vector<float> right;
+  charMatrix tag;
+  octave_value userdata;
+  int channels;
+  int fs;
+  int nbits;
+  int id;
+  unsigned int sample_number;
+  unsigned int end_sample;
+  PaStream *stream;
+  PaStreamParameters input_parameters;
+  audio_type type;
+  DECLARE_OCTAVE_ALLOCATOR
+  DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
 };
 
 #endif // RECORDER_CLASS_H