src/usr.bin/sndiod/dev.h - diff

Return to dev.h CVS log

Up to [local] / src / usr.bin / sndiod

Diff for /src/usr.bin/sndiod/dev.h between version 1.39 and 1.40

-version 1.39, 2021/03/03 10:13:06
+version 1.40, 2021/03/03 10:19:06
 Line 177
 Line 177
 Line 177
  };
  /*
+  * MIDI time code (MTC)
+  */
+ struct mtc {
+         /*
+          * MIDI time code (MTC) states
+          */
+ #define MTC_STOP        1               /* stopped, can't start */
+ #define MTC_START       2               /* attempting to start */
+ #define MTC_RUN         3               /* started */
+         unsigned int tstate;            /* one of MTC_* constants */
+         struct dev *dev;
+         unsigned int origin;            /* MTC start time */
+         unsigned int fps;               /* MTC frames per second */
+ #define MTC_FPS_24      0
+ #define MTC_FPS_25      1
+ #define MTC_FPS_30      3
+         unsigned int fps_id;            /* one of above */
+         unsigned int hr;                /* MTC hours */
+         unsigned int min;               /* MTC minutes */
+         unsigned int sec;               /* MTC seconds */
+         unsigned int fr;                /* MTC frames */
+         unsigned int qfr;               /* MTC quarter frames */
+         int delta;                      /* rel. to the last MTC tick */
+         int refs;
+ };
+ /*
   * audio device with plenty of slots
   */
  struct dev {
-Line 242
+Line 270
 Line 242
 Line 270
          unsigned int bufsz, round, rate;
          unsigned int prime;
-         /*
-          * MIDI time code (MTC)
-          */
-         struct {
-                 unsigned int origin;            /* MTC start time */
-                 unsigned int fps;               /* MTC frames per second */
- #define MTC_FPS_24      0
- #define MTC_FPS_25      1
- #define MTC_FPS_30      3
-                 unsigned int fps_id;            /* one of above */
-                 unsigned int hr;                /* MTC hours */
-                 unsigned int min;               /* MTC minutes */
-                 unsigned int sec;               /* MTC seconds */
-                 unsigned int fr;                /* MTC frames */
-                 unsigned int qfr;               /* MTC quarter frames */
-                 int delta;                      /* rel. to the last MTC tick */
-                 int refs;
-         } mtc;
-         /*
-          * MIDI machine control (MMC)
-          */
- #define MMC_STOP        1                       /* stopped, can't start */
- #define MMC_START       2                       /* attempting to start */
- #define MMC_RUN         3                       /* started */
-         unsigned int tstate;                    /* one of above */
          unsigned int master;                    /* software vol. knob */
          unsigned int master_enabled;            /* 1 if h/w has no vo. knob */
  };
-Line 277
+Line 278
 Line 277
 Line 278
  extern struct ctl *ctl_list;
  extern struct slot slot_array[DEV_NSLOT];
  extern struct ctlslot ctlslot_array[DEV_NCTLSLOT];
+ extern struct mtc mtc_array[1];
  void slot_array_init(void);
-Line 312
+Line 314
 Line 312
 Line 314
  void dev_midi_slotdesc(struct dev *, struct slot *);
  void dev_midi_dump(struct dev *);
- void dev_mmcstart(struct dev *);
+ void mtc_midi_qfr(struct mtc *, int);
- void dev_mmcstop(struct dev *);
+ void mtc_midi_full(struct mtc *);
- void dev_mmcloc(struct dev *, unsigned int);
+ void mtc_trigger(struct mtc *);
+ void mtc_start(struct mtc *);
+ void mtc_stop(struct mtc *);
+ void mtc_loc(struct mtc *, unsigned int);
+ void mtc_setdev(struct mtc *, struct dev *);
  /*
   * sio_open(3) like interface for clients