diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-09-22 11:30:30 +0800 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-09-22 11:30:30 +0800 |
| commit | 94aa9097f4ded68623160d754a4bf2632b8efc79 (patch) | |
| tree | 94a5e1192a18f760dc00ff5b36e1f7ba36fd449b /src/pulse/def.h | |
| parent | c1e59f7d762fb147bc5250ebddb9cf5639aba522 (diff) | |
| parent | c194db71b0ff853b4f46df26e135edf63b215451 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/pulse/def.h')
| -rw-r--r-- | src/pulse/def.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pulse/def.h b/src/pulse/def.h index 1a7da974..e839bd92 100644 --- a/src/pulse/def.h +++ b/src/pulse/def.h @@ -95,13 +95,14 @@ static inline int PA_STREAM_IS_GOOD(pa_stream_state_t x) { typedef enum pa_operation_state { PA_OPERATION_RUNNING, /**< The operation is still running */ PA_OPERATION_DONE, /**< The operation has been completed */ - PA_OPERATION_CANCELED /**< The operation has been canceled */ + PA_OPERATION_CANCELLED /**< The operation has been cancelled. Before 0.9.18 this was called PA_OPERATION_CANCELED. That name is still available for compatibility. */ } pa_operation_state_t; /** \cond fulldocs */ #define PA_OPERATION_RUNNING PA_OPERATION_RUNNING #define PA_OPERATION_DONE PA_OPERATION_DONE -#define PA_OPERATION_CANCELED PA_OPERATION_CANCELED +#define PA_OPERATION_CANCELED PA_OPERATION_CANCELLED +#define PA_OPERATION_CANCELLED PA_OPERATION_CANCELLED /** \endcond */ /** An invalid index */ |