aout: remove pf_ prefix where left (cosmetic)

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 81efcebbc48afd5dacf503790a64919e2dfd3f50..bc8fbe1c9784e5904840f6dc3707b9cd7574272e 100644 (file)
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -144,11 +144,11 @@ struct audio_output
         only when succesfully probed and not afterward) */
 
     struct aout_sys_t *sys; /**< Output plugin private data */
-    void (*pf_play)(audio_output_t *, block_t *, mtime_t *); /**< Play callback
+    void (*play)(audio_output_t *, block_t *, mtime_t *); /**< Play callback
         - queue a block for playback */
-    void (* pf_pause)( audio_output_t *, bool, mtime_t ); /**< Pause/resume
+    void (*pause)( audio_output_t *, bool, mtime_t ); /**< Pause/resume
         callback (optional, may be NULL) */
-    void (* pf_flush)( audio_output_t *, bool ); /**< Flush/drain callback
+    void (*flush)( audio_output_t *, bool ); /**< Flush/drain callback
         (optional, may be NULL) */
     int (*volume_set)(audio_output_t *, float); /**< Volume setter (or NULL) */
     int (*mute_set)(audio_output_t *, bool); /**< Mute setter (or NULL) */

diff --git a/modules/audio_output/adummy.c b/modules/audio_output/adummy.c
index 3e9b9597c1a61c9c73d74d4436e42f64bff575b6..56659fff2216f94a95b90b0540f08a58723f5125 100644 (file)
--- a/modules/audio_output/adummy.c
+++ b/modules/audio_output/adummy.c
@@ -53,9 +53,9 @@ static int Open( vlc_object_t * p_this )
 {
     audio_output_t * p_aout = (audio_output_t *)p_this;
 
-    p_aout->pf_play = Play;
-    p_aout->pf_pause = NULL;
-    p_aout->pf_flush = NULL;
+    p_aout->play = Play;
+    p_aout->pause = NULL;
+    p_aout->flush = NULL;
     p_aout->volume_set = NULL;
     p_aout->mute_set = NULL;
 

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 3773d1920ba390edcec3cfd03f2225d0945fe1af..e77cb98fa2228be5042d445988f00bdb8be6e3cd 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -521,15 +521,15 @@ static int Open (vlc_object_t *obj)
         aout_SoftVolumeInit (aout);
     }
 
-    aout->pf_play = Play;
+    aout->play = Play;
     if (snd_pcm_hw_params_can_pause (hw))
-        aout->pf_pause = Pause;
+        aout->pause = Pause;
     else
     {
-        aout->pf_pause = PauseDummy;
+        aout->pause = PauseDummy;
         msg_Warn (aout, "device cannot be paused");
     }
-    aout->pf_flush = Flush;
+    aout->flush = Flush;
 
     /* Setup audio-device choices */
     {

diff --git a/modules/audio_output/amem.c b/modules/audio_output/amem.c
index 704dcacb15793db9679e2a6e0f5797655664f883..23dc23ac1674141de0210c3b2e0110f04e9e96ae 100644 (file)
--- a/modules/audio_output/amem.c
+++ b/modules/audio_output/amem.c
@@ -235,9 +235,9 @@ static int Open (vlc_object_t *obj)
     aout->format.i_rate = rate;
     aout->format.i_original_channels = aout->format.i_physical_channels;
 
-    aout->pf_play = Play;
-    aout->pf_pause = Pause;
-    aout->pf_flush = Flush;
+    aout->play = Play;
+    aout->pause = Pause;
+    aout->flush = Flush;
     if (sys->set_volume != NULL)
     {
         aout->volume_set = VolumeSet;

diff --git a/modules/audio_output/audioqueue.c b/modules/audio_output/audioqueue.c
index 6dc8c8cae785213f27a380a84106d96894f23620..9c4777b6133b143ebd3ea6d192f3eaeac3df9977 100644 (file)
--- a/modules/audio_output/audioqueue.c
+++ b/modules/audio_output/audioqueue.c
@@ -127,9 +127,9 @@ static int Open ( vlc_object_t *p_this )
     p_aout->format.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
     p_aout->format.i_rate = 44100;
     aout_PacketInit(p_aout, &p_sys->packet, FRAME_SIZE);
-    p_aout->pf_play = aout_PacketPlay;
-    p_aout->pf_pause = aout_PacketPause;
-    p_aout->pf_flush = aout_PacketFlush;
+    p_aout->play = aout_PacketPlay;
+    p_aout->pause = aout_PacketPause;
+    p_aout->flush = aout_PacketFlush;
 
     msg_Dbg(p_aout, "Starting AudioQueue (status = %i)", status);
     status = AudioQueueStart(p_sys->audioQueue, NULL);

diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c
index 838935c8f53f1ad2c4cc044fc303026cf929182b..d6a63979b81cfa90c34e01c01d534ef8a6aeb08d 100644 (file)
--- a/modules/audio_output/audiotrack.c
+++ b/modules/audio_output/audiotrack.c
@@ -287,8 +287,8 @@ static int Open(vlc_object_t *p_this)
     }
 
     p_aout->sys = p_sys;
-    p_aout->pf_play = Play;
-    p_aout->pf_pause = Pause;
+    p_aout->play = Play;
+    p_aout->pause = Pause;
 
     p_sys->at_start(p_sys->AudioTrack);
 

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 36134b48a0cc008b47b40135b5ffe5138d3885bb..5c8714154140c69dc753d99f39288dbb3c567596 100644 (file)
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -179,9 +179,9 @@ static int Open(vlc_object_t * p_this)
     p_sys->b_changed_mixing = false;
     memset(p_sys->p_remainder_buffer, 0, sizeof(uint8_t) * BUFSIZE);
 
-    p_aout->pf_play = aout_PacketPlay;
-    p_aout->pf_pause = aout_PacketPause;
-    p_aout->pf_flush = aout_PacketFlush;
+    p_aout->play = aout_PacketPlay;
+    p_aout->pause = aout_PacketPause;
+    p_aout->flush = aout_PacketFlush;
 
     aout_FormatPrint(p_aout, "VLC is looking for:", &p_aout->format);
 
@@ -1370,7 +1370,7 @@ static int AudioDeviceCallback(vlc_object_t *p_this, const char *psz_variable,
 
 
 /*****************************************************************************
- * VolumeSet: Implements pf_volume_set(). Update the CoreAudio AU volume immediately.
+ * VolumeSet: Implements volume_set(). Update the CoreAudio AU volume immediately.
  *****************************************************************************/
 static int VolumeSet(audio_output_t * p_aout, float volume)
 {

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 7aaa5c1d37381dea923cfbfe40a25350dc69fc3b..e345ffc40835ae7df07544054668939393f58d1d 100644 (file)
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -292,9 +292,9 @@ static int OpenAudio( vlc_object_t *p_this )
         goto error;
     }
 
-    p_aout->pf_play = Play;
-    p_aout->pf_pause = aout_PacketPause;
-    p_aout->pf_flush = aout_PacketFlush;
+    p_aout->play = Play;
+    p_aout->pause = aout_PacketPause;
+    p_aout->flush = aout_PacketFlush;
 
     /* Volume */
     if( val.i_int == AOUT_VAR_SPDIF )
@@ -551,7 +551,7 @@ static void Play( audio_output_t *p_aout, block_t *p_buffer,
     SetEvent( p_aout->sys->notif.event );
 
     aout_PacketPlay( p_aout, p_buffer, drift );
-    p_aout->pf_play = aout_PacketPlay;
+    p_aout->play = aout_PacketPlay;
 }
 
 static int VolumeSet( audio_output_t *p_aout, float vol )
@@ -615,7 +615,7 @@ static void CloseAudio( vlc_object_t *p_this )
     {
         vlc_atomic_set(&p_aout->sys->notif.abort, 1);
         /* wake up the audio thread if needed */
-        if( p_aout->pf_play == Play )
+        if( p_aout->play == Play )
             SetEvent( p_sys->notif.event );
 
         vlc_join( p_sys->notif.thread, NULL );

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index ea390f9f4f583d88863539183c5a9823b768cdb3..7f498c0ea96cc8a5b24a2292d4bf451565f14a04 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -159,9 +159,9 @@ static int Open( vlc_object_t * p_this )
         return VLC_EGENERIC;
     }
 
-    p_aout->pf_play = Play;
-    p_aout->pf_pause = NULL;
-    p_aout->pf_flush = NULL;
+    p_aout->play = Play;
+    p_aout->pause = NULL;
+    p_aout->flush = NULL;
 
     /* Audio format */
     psz_format = var_CreateGetString( p_this, "audiofile-format" );

diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c
index 3cec48cb2b0c20d66fa3758539d20307477a4211..6a944eba0a71796c3a90d2685f28a40d66b34614 100644 (file)
--- a/modules/audio_output/jack.c
+++ b/modules/audio_output/jack.c
@@ -143,9 +143,9 @@ static int Open( vlc_object_t *p_this )
     // TODO add buffer size callback
     p_aout->format.i_rate = jack_get_sample_rate( p_sys->p_jack_client );
 
-    p_aout->pf_play = aout_PacketPlay;
-    p_aout->pf_pause = aout_PacketPause;
-    p_aout->pf_flush = aout_PacketFlush;
+    p_aout->play = aout_PacketPlay;
+    p_aout->pause = aout_PacketPause;
+    p_aout->flush = aout_PacketFlush;
     aout_PacketInit( p_aout, &p_sys->packet,
                      jack_get_buffer_size( p_sys->p_jack_client ) );
     aout_SoftVolumeInit( p_aout );

diff --git a/modules/audio_output/kai.c b/modules/audio_output/kai.c
index a31355c7b2f00b532aba7f37b42cce8c7be1522a..afca932bb239ebd021d7db08195ff185b432ebfa 100644 (file)
--- a/modules/audio_output/kai.c
+++ b/modules/audio_output/kai.c
@@ -203,9 +203,9 @@ static int Open ( vlc_object_t *p_this )
 
     p_aout->format   = format;
 
-    p_aout->pf_play  = Play;
-    p_aout->pf_pause = aout_PacketPause;
-    p_aout->pf_flush = aout_PacketFlush;
+    p_aout->play  = Play;
+    p_aout->pause = aout_PacketPause;
+    p_aout->flush = aout_PacketFlush;
 
     aout_PacketInit( p_aout, &p_sys->packet,
                      ks_obtained.ulBufferSize / i_bytes_per_frame );

diff --git a/modules/audio_output/opensles_android.c b/modules/audio_output/opensles_android.c
index 0628a832869e59c7c00b5c8985b66174249bb92d..8a0182b88e69cde0727a518c7cdeddc843e2ce01 100644 (file)
--- a/modules/audio_output/opensles_android.c
+++ b/modules/audio_output/opensles_android.c
@@ -370,9 +370,9 @@ static int Open( vlc_object_t *p_this )
     // we want 16bit signed data little endian.
     p_aout->format.i_format              = VLC_CODEC_S16L;
     p_aout->format.i_physical_channels   = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
-    p_aout->pf_play                      = Play;
-    p_aout->pf_pause                     = Pause;
-    p_aout->pf_flush                     = Flush;
+    p_aout->play                         = Play;
+    p_aout->pause                        = Pause;
+    p_aout->flush                        = Flush;
 
     aout_FormatPrepare( &p_aout->format );
 

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 8f9c88d1b34d6e66762faf5b9daa7a14d5c47c73..6d5bd62735902aab4a172dd5cd6502461a504ff4 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -226,9 +226,9 @@ static int Open (vlc_object_t *obj)
 
     /* Setup audio_output_t */
     aout->format.i_format = fourcc;
-    aout->pf_play = Play;
-    aout->pf_pause = Pause;
-    aout->pf_flush = Flush;
+    aout->play = Play;
+    aout->pause = Pause;
+    aout->flush = Flush;
     aout->volume_set = NULL;
     aout->mute_set = NULL;
 

diff --git a/modules/audio_output/packet.c b/modules/audio_output/packet.c
index b5f9376fecc50d4c600941ab38af67a861a25e7f..deb493eda1ee1610018df519f5083e26a415a7aa 100644 (file)
--- a/modules/audio_output/packet.c
+++ b/modules/audio_output/packet.c
@@ -310,7 +310,7 @@ static block_t *aout_OutputSlice (audio_output_t *p_aout)
 /**
  * Dequeues the next audio packet (a.k.a. audio fragment).
  * The audio output plugin must first call aout_PacketPlay() to queue the
- * decoded audio samples. Typically, audio_output_t.pf_play is set to, or calls
+ * decoded audio samples. Typically, audio_output_t.play is set to, or calls
  * aout_PacketPlay().
  * @note This function is considered legacy. Please do not use this function in
  * new audio output plugins.

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 0e8e8b046833e643e176ddce86e44558ea45d0c5..cbedd4b384ee61683773813d9b6f337caa1f574b 100644 (file)
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -984,9 +984,9 @@ static int Open(vlc_object_t *obj)
     pa_threaded_mainloop_unlock(sys->mainloop);
 
     aout->format.i_format = format;
-    aout->pf_play = Play;
-    aout->pf_pause = Pause;
-    aout->pf_flush = Flush;
+    aout->play = Play;
+    aout->pause = Pause;
+    aout->flush = Flush;
     aout->volume_set = VolumeSet;
     aout->mute_set = MuteSet;
     return VLC_SUCCESS;

diff --git a/modules/audio_output/sndio.c b/modules/audio_output/sndio.c
index 445297da6f3506d97e420b9fd4fd924f6ed47a28..f52f4a9a0d22caadd7ba726cbac869a8cc8e77d1 100644 (file)
--- a/modules/audio_output/sndio.c
+++ b/modules/audio_output/sndio.c
@@ -152,9 +152,9 @@ static int Open (vlc_object_t *obj)
 
     aout->format = f;
     aout->sys = sys;
-    aout->pf_play = Play;
-    aout->pf_pause = Pause;
-    aout->pf_flush  = NULL; /* sndio sucks! */
+    aout->play = Play;
+    aout->pause = Pause;
+    aout->flush  = NULL; /* sndio sucks! */
     if (sio_onvol(sys->hdl, VolumeChanged, aout))
     {
         aout->volume_set = VolumeSet;

diff --git a/modules/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index 73e9de0265ab3711066acf93fd19e307fe957978..fd5ddda0ded0ac4531d008e00fb16134c94592ac 100644 (file)
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -800,9 +800,9 @@ retry:
     Leave();
 
     aout->format = format;
-    aout->pf_play = Play;
-    aout->pf_pause = Pause;
-    aout->pf_flush = Flush;
+    aout->play = Play;
+    aout->pause = Pause;
+    aout->flush = Flush;
     /*if (AOUT_FMT_LINEAR(&format) && !exclusive)*/
     {
         aout->volume_set = SimpleVolumeSet;

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 7c7b545878215f361afe675d3cb577b5ee64d279..90554b97bc68f49e6957041532b2a9ed9a99f9ae 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -168,9 +168,9 @@ static int Open( vlc_object_t *p_this )
     if( p_aout->sys == NULL )
         return VLC_ENOMEM;
 
-    p_aout->pf_play = Play;
-    p_aout->pf_pause = aout_PacketPause;
-    p_aout->pf_flush = aout_PacketFlush;
+    p_aout->play = Play;
+    p_aout->pause = aout_PacketPause;
+    p_aout->flush = aout_PacketFlush;
 
     /*
       check for configured audio device!

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 0367abbabcadb4e5184d623868da8cca0ea7a1df..a5f7e67d1367deff8623cdef3c79b4514bed7b81 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -43,7 +43,7 @@
  *
  * @warning The caller (i.e. the audio output plug-in) is responsible for
  * interlocking and synchronizing call to this function and to the
- * audio_output_t.pf_volume_set callback. This ensures that VLC gets correct
+ * audio_output_t.volume_set callback. This ensures that VLC gets correct
  * volume information (possibly with a latency).
  */
 static void aout_OutputVolumeReport (audio_output_t *aout, float volume)
@@ -237,7 +237,7 @@ void aout_OutputPlay (audio_output_t *aout, block_t *block)
     }
 
     if (likely(owner->module != NULL))
-        aout->pf_play (aout, block, &drift);
+        aout->play (aout, block, &drift);
     else
         block_Release (block);
 /**
@@ -274,8 +274,8 @@ void aout_OutputPlay (audio_output_t *aout, block_t *block)
 void aout_OutputPause( audio_output_t *aout, bool pause, mtime_t date )
 {
     aout_assert_locked( aout );
-    if( aout->pf_pause != NULL )
-        aout->pf_pause( aout, pause, date );
+    if( aout->pause != NULL )
+        aout->pause( aout, pause, date );
 }
 
 /**
@@ -288,6 +288,6 @@ void aout_OutputFlush( audio_output_t *aout, bool wait )
 {
     aout_assert_locked( aout );
 
-    if( aout->pf_flush != NULL )
-        aout->pf_flush( aout, wait );
+    if( aout->flush != NULL )
+        aout->flush( aout, wait );
 }