Skip to content

Commit 6501be4

Browse files
committed
Refresh Cvc
1 parent 096d728 commit 6501be4

29 files changed

+426
-361
lines changed

libcvc/gvc-channel-map-private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program; if not, write to the Free Software
17-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1818
*
1919
*/
2020

libcvc/gvc-channel-map.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program; if not, write to the Free Software
17-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1818
*
1919
*/
2020

@@ -27,6 +27,8 @@
2727
#include <glib.h>
2828
#include <glib/gi18n-lib.h>
2929

30+
#include <pulse/pulseaudio.h>
31+
3032
#include "gvc-channel-map.h"
3133
#include "gvc-channel-map-private.h"
3234

@@ -107,7 +109,7 @@ gvc_channel_map_set_balance (GvcChannelMap *map,
107109
{
108110
pa_cvolume cv;
109111

110-
g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
112+
g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
111113

112114
if (!gvc_channel_map_can_balance (map))
113115
return;
@@ -147,7 +149,7 @@ gvc_channel_map_set_fade (GvcChannelMap *map,
147149
{
148150
pa_cvolume cv;
149151

150-
g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
152+
g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
151153

152154
if (!gvc_channel_map_can_fade (map))
153155
return;
@@ -189,7 +191,7 @@ gvc_channel_map_set_lfe (GvcChannelMap *map,
189191
{
190192
pa_cvolume cv;
191193

192-
g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
194+
g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
193195

194196
if (!gvc_channel_map_has_lfe (map))
195197
return;
@@ -225,7 +227,8 @@ gvc_channel_map_get_mapping (const GvcChannelMap *map)
225227

226228
/**
227229
* gvc_channel_map_has_position:
228-
* @position: (type int)
230+
* @map:
231+
* @position:
229232
*
230233
* Returns:
231234
*/

libcvc/gvc-channel-map.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program; if not, write to the Free Software
17-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1818
*
1919
*/
2020

libcvc/gvc-mixer-card-private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program; if not, write to the Free Software
17-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1818
*
1919
*/
2020

libcvc/gvc-mixer-card.c

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program; if not, write to the Free Software
19-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
2020
*
2121
*/
2222

@@ -220,6 +220,15 @@ _pa_context_set_card_profile_by_index_cb (pa_context *cont
220220
card->priv->profile_op = NULL;
221221
}
222222

223+
/**
224+
* gvc_mixer_card_change_profile:
225+
* @card: a #GvcMixerCard
226+
* @profile: (allow-none): the profile to change to or %NULL.
227+
*
228+
* Change the profile in use on this card.
229+
*
230+
* Returns: %TRUE if profile successfully changed or already using this profile.
231+
*/
223232
gboolean
224233
gvc_mixer_card_change_profile (GvcMixerCard *card,
225234
const char *profile)
@@ -564,8 +573,7 @@ gvc_mixer_card_finalize (GObject *object)
564573
g_free (mixer_card->priv->human_profile);
565574
mixer_card->priv->human_profile = NULL;
566575

567-
g_list_foreach (mixer_card->priv->profiles, (GFunc) free_profile, NULL);
568-
g_list_free (mixer_card->priv->profiles);
576+
g_list_free_full (mixer_card->priv->profiles, (GDestroyNotify) free_profile);
569577
mixer_card->priv->profiles = NULL;
570578

571579
g_list_free_full (mixer_card->priv->ports, (GDestroyNotify) free_port);

libcvc/gvc-mixer-card.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* You should have received a copy of the GNU General Public License
1717
* along with this program; if not, write to the Free Software
18-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
18+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1919
*
2020
*/
2121

libcvc/gvc-mixer-control-private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program; if not, write to the Free Software
17-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1818
*
1919
*/
2020

0 commit comments

Comments
 (0)