From: Steinar Gunderson <sgunderson@bigfoot.com>
Date: Sat, 25 Sep 2010 17:37:19 +0000 (+0200)
Subject: Use C comments consistently.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=de98a24ddcc13572b2cb7a37307e0b6777cc5c5a;p=vlc

Use C comments consistently.
---

diff --git a/modules/access/sdi.cpp b/modules/access/sdi.cpp
index aae8cb6c27..61bb92ac85 100644
--- a/modules/access/sdi.cpp
+++ b/modules/access/sdi.cpp
@@ -117,9 +117,9 @@ struct demux_sys_t
     int i_rate, i_channels;
 
     vlc_mutex_t frame_lock;
-    block_t *p_video_frame;  // protected by <frame_lock>
-    block_t *p_audio_frame;  // protected by <frame_lock>
-    vlc_cond_t has_frame;  // related to <frame_lock>
+    block_t *p_video_frame;  /* protected by <frame_lock> */
+    block_t *p_audio_frame;  /* protected by <frame_lock> */
+    vlc_cond_t has_frame;  /* related to <frame_lock> */
 };
 
 class DeckLinkCaptureDelegate : public IDeckLinkInputCallback
@@ -129,7 +129,7 @@ public:
 
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; }
 
-    // Note: AddRef() and Release() here are not thread safe.
+    /* Note: AddRef() and Release() here are not thread safe. */
 
     virtual ULONG STDMETHODCALLTYPE AddRef(void)
     {
@@ -318,7 +318,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
    
-    // Set up the video and audio sources. 
+    /* Set up the video and audio sources. */
     IDeckLinkConfiguration *p_config;
     if( p_sys->p_card->QueryInterface( IID_IDeckLinkConfiguration, (void**)&p_config) != S_OK )
     {
@@ -397,7 +397,7 @@ static int Open( vlc_object_t *p_this )
 
     p_config->Release();
 
-    // Get the list of display modes.
+    /* Get the list of display modes. */
     IDeckLinkDisplayModeIterator *p_display_iterator;
     result = p_sys->p_input->GetDisplayModeIterator( &p_display_iterator );
     if( result != S_OK )
@@ -416,8 +416,10 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    // Pad the --sdi-mode string to four characters, so the user can specify e.g. "pal"
-    // without having to add the trailing space.
+    /*
+     * Pad the --sdi-mode string to four characters, so the user can specify e.g. "pal"
+     * without having to add the trailing space.
+     */
     char sz_display_mode_padded[5];
     strcpy(sz_display_mode_padded, "    ");
     for( int i = 0; i < strlen( psz_display_mode ); ++i )
@@ -520,7 +522,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
   
-    // Set up audio. 
+    /* Set up audio. */
     p_sys->i_rate = var_CreateGetInteger( p_demux, "sdi-audio-rate" );
     p_sys->i_channels = var_CreateGetInteger( p_demux, "sdi-audio-channels" );
     if( p_sys->i_rate > 0 && p_sys->i_channels > 0 )
@@ -635,7 +637,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_TIME:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = mdate();  // FIXME
+            *pi64 = mdate();  /* FIXME */
             return VLC_SUCCESS;
 
         /* TODO implement others */